diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2020-04-05 18:38:04 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2020-04-05 18:38:04 (GMT) |
| commit | 2c2627e7f66ae9a7c333ad250101f97ae65178ab (patch) | |
| tree | 49e2c4a387fb45f10d968d9e5fea4c9f4534a0fa /fortran/testpar/CMakeLists.txt | |
| parent | 70495751c05c4471be3a55b0e933e4d1e73d79c5 (diff) | |
| download | hdf5-2c2627e7f66ae9a7c333ad250101f97ae65178ab.zip hdf5-2c2627e7f66ae9a7c333ad250101f97ae65178ab.tar.gz hdf5-2c2627e7f66ae9a7c333ad250101f97ae65178ab.tar.bz2 | |
Flag construction must be after compiler detection
Diffstat (limited to 'fortran/testpar/CMakeLists.txt')
| -rw-r--r-- | fortran/testpar/CMakeLists.txt | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/fortran/testpar/CMakeLists.txt b/fortran/testpar/CMakeLists.txt index 740d30e..12489528 100644 --- a/fortran/testpar/CMakeLists.txt +++ b/fortran/testpar/CMakeLists.txt @@ -25,7 +25,9 @@ target_include_directories (parallel_test PRIVATE ${TESTPAR_INCLUDES} ) target_compile_options(parallel_test - PRIVATE $<$<STREQUAL:"x${CMAKE_Fortran_SIMULATE_ID}","xMSVC">:${WIN_COMPILE_FLAGS}> + PRIVATE + "${HDF5_CMAKE_Fortran_FLAGS}" + $<$<STREQUAL:"x${CMAKE_Fortran_SIMULATE_ID}","xMSVC">:${WIN_COMPILE_FLAGS}> ) if (NOT BUILD_SHARED_LIBS) target_link_libraries (parallel_test @@ -51,12 +53,8 @@ else () ) endif () -#set_property(TARGET parallel_test APPEND PROPERTY -# LINK_FLAGS $<$<STREQUAL:"x${CMAKE_Fortran_SIMULATE_ID}","xMSVC">:"-SUBSYSTEM:CONSOLE"> -#) -#set_property(TARGET parallel_test APPEND PROPERTY -# LINK_FLAGS $<$<STREQUAL:"x${CMAKE_Fortran_SIMULATE_ID}","xMSVC">:${WIN_LINK_FLAGS}> -#) +#set_property(TARGET parallel_test APPEND PROPERTY LINK_FLAGS $<$<STREQUAL:"x${CMAKE_Fortran_SIMULATE_ID}","xMSVC">:"-SUBSYSTEM:CONSOLE">) +#set_property(TARGET parallel_test APPEND PROPERTY LINK_FLAGS $<$<STREQUAL:"x${CMAKE_Fortran_SIMULATE_ID}","xMSVC">:${WIN_LINK_FLAGS}>) if(MSVC) set_property(TARGET parallel_test PROPERTY LINK_FLAGS "/SUBSYSTEM:CONSOLE ${WIN_LINK_FLAGS}") endif() |