summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAllen Byrne <byrn@hdfgroup.org>2018-05-03 17:10:13 (GMT)
committerAllen Byrne <byrn@hdfgroup.org>2018-05-03 17:10:13 (GMT)
commitab971fafdd43dbf55e0dc017fb17077a0922e4c4 (patch)
tree83dfa4a9023ccba93ce62a0da1cef0175a6cb628
parent866337babe20fa3cd003f7c89b5ece7e60f5b0b2 (diff)
downloadhdf5-ab971fafdd43dbf55e0dc017fb17077a0922e4c4.zip
hdf5-ab971fafdd43dbf55e0dc017fb17077a0922e4c4.tar.gz
hdf5-ab971fafdd43dbf55e0dc017fb17077a0922e4c4.tar.bz2
Fix another command revert
-rw-r--r--fortran/examples/CMakeLists.txt30
1 files changed, 18 insertions, 12 deletions
diff --git a/fortran/examples/CMakeLists.txt b/fortran/examples/CMakeLists.txt
index c073177..1b7e4f0 100644
--- a/fortran/examples/CMakeLists.txt
+++ b/fortran/examples/CMakeLists.txt
@@ -107,12 +107,15 @@ foreach (example ${F2003_examples})
PRIVATE
${HDF5_F90_LIB_TARGET} ${HDF5_LIB_TARGET}
)
- set_property(TARGET f03_ex_${example} APPEND PROPERTY
- LINK_FLAGS $<$<STREQUAL:"x${CMAKE_Fortran_SIMULATE_ID}","xMSVC">:"-SUBSYSTEM:CONSOLE">
- )
- set_property(TARGET f03_ex_${example} APPEND PROPERTY
- LINK_FLAGS $<$<STREQUAL:"x${CMAKE_Fortran_SIMULATE_ID}","xMSVC">:${WIN_LINK_FLAGS}>
- )
+# set_property(TARGET f03_ex_${example} APPEND PROPERTY
+# LINK_FLAGS $<$<STREQUAL:"x${CMAKE_Fortran_SIMULATE_ID}","xMSVC">:"-SUBSYSTEM:CONSOLE">
+# )
+# set_property(TARGET f03_ex_${example} APPEND PROPERTY
+# LINK_FLAGS $<$<STREQUAL:"x${CMAKE_Fortran_SIMULATE_ID}","xMSVC">:${WIN_LINK_FLAGS}>
+# )
+ if(MSVC)
+ set_property(TARGET f03_ex_${example} APPEND PROPERTY LINK_FLAGS "-SUBSYSTEM:CONSOLE;${WIN_LINK_FLAGS}")
+ endif()
set_target_properties (f03_ex_${example} PROPERTIES
LINKER_LANGUAGE Fortran
FOLDER examples/fortran03
@@ -133,12 +136,15 @@ foreach (example ${F2003_examples})
PRIVATE
${HDF5_F90_LIBSH_TARGET} ${HDF5_LIBSH_TARGET}
)
- set_property(TARGET f03_ex_${example}-shared APPEND PROPERTY
- LINK_FLAGS $<$<STREQUAL:"x${CMAKE_Fortran_SIMULATE_ID}","xMSVC">:"-SUBSYSTEM:CONSOLE">
- )
- set_property(TARGET f03_ex_${example}-shared APPEND PROPERTY
- LINK_FLAGS $<$<STREQUAL:"x${CMAKE_Fortran_SIMULATE_ID}","xMSVC">:${WIN_LINK_FLAGS}>
- )
+# set_property(TARGET f03_ex_${example}-shared APPEND PROPERTY
+# LINK_FLAGS $<$<STREQUAL:"x${CMAKE_Fortran_SIMULATE_ID}","xMSVC">:"-SUBSYSTEM:CONSOLE">
+# )
+# set_property(TARGET f03_ex_${example}-shared APPEND PROPERTY
+# LINK_FLAGS $<$<STREQUAL:"x${CMAKE_Fortran_SIMULATE_ID}","xMSVC">:${WIN_LINK_FLAGS}>
+# )
+ if(MSVC)
+ set_property(TARGET f03_ex_${example}-shared APPEND PROPERTY LINK_FLAGS "-SUBSYSTEM:CONSOLE;${WIN_LINK_FLAGS}")
+ endif()
set_target_properties (f03_ex_${example}-shared PROPERTIES
LINKER_LANGUAGE Fortran
FOLDER examples/fortran03