Skip to content

8367374: JavaFX debug builds fail on Windows #1901

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

8367374: JavaFX debug builds fail on Windows #1901

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 9 additions & 7 deletions modules/javafx.web/src/main/native/Source/ThirdParty/icu/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
# http://userguide.icu-project.org/howtouseicu#TOC-C-With-Your-Own-Build-System
if(WIN32)
set(CMAKE_CXX_FLAGS "" CACHE STRING "Clear CXX flags for this sub-project" FORCE)
set(CMAKE_CXX_COMPILER "${MSVC_BIN_DIR}/cl.exe")
#set(CMAKE_C_COMPILER "${MSVC_BIN_DIR}/cl.exe")
set(CMAKE_LINKER "${MSVC_BIN_DIR}/link.exe")
set(CMAKE_PROGRAM "${MSVC_BIN_DIR}/nmake.exe")
set(CMAKE_AR "${MSVC_BIN_DIR}/lib.exe")
add_compile_options(/FS)
set(CMAKE_CXX_FLAGS "" CACHE STRING "Clear CXX flags for this sub-project" FORCE)
set(CMAKE_BUILD_TYPE Release CACHE STRING "Build type" FORCE)
set(CMAKE_C_COMPILER "${MSVC_BIN_DIR}/cl.exe" CACHE FILEPATH "" FORCE)
set(CMAKE_CXX_COMPILER "${MSVC_BIN_DIR}/cl.exe" CACHE FILEPATH "" FORCE)
set(CMAKE_LINKER "${MSVC_BIN_DIR}/link.exe" CACHE FILEPATH "" FORCE)
set(CMAKE_AR "${MSVC_BIN_DIR}/lib.exe" CACHE FILEPATH "" FORCE)

add_compile_options(/FS)
endif()

set(ICU_PUBLIC_DEFINES
Expand Down Expand Up @@ -620,6 +621,7 @@ add_custom_command(
if (MSVC)
# On Windows, data_as_asm could generates .obj file directly.
set(ICU_DATA_SYMBOL_FILE "${CMAKE_BINARY_DIR}/icu/data/${ICU_DATA_FILE_NAME}_dat.obj")
message(STATUS "ICU_DATA_SYMBOL_FILE = ${ICU_DATA_SYMBOL_FILE}")
set_source_files_properties(${ICU_DATA_SYMBOL_FILE} PROPERTIES EXTERNAL_OBJECT TRUE GENERATED TRUE)
else ()
set(ICU_DATA_SYMBOL_FILE "${CMAKE_BINARY_DIR}/icu/data/${ICU_DATA_FILE_NAME}_dat.S")
Expand Down