From c6827191f928a44012d200aaaa5319c603a700bd Mon Sep 17 00:00:00 2001 From: Allen Byrne Date: Wed, 2 May 2018 12:19:30 -0500 Subject: TRILABS-19 fix syntax for windows --- fortran/examples/CMakeLists.txt | 6 +++--- fortran/src/CMakeLists.txt | 2 +- fortran/test/CMakeLists.txt | 12 ++++++------ hl/fortran/src/CMakeLists.txt | 2 +- hl/fortran/test/CMakeLists.txt | 8 ++++---- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/fortran/examples/CMakeLists.txt b/fortran/examples/CMakeLists.txt index aa2d138..ad3c9c6 100644 --- a/fortran/examples/CMakeLists.txt +++ b/fortran/examples/CMakeLists.txt @@ -63,7 +63,7 @@ foreach (example ${examples}) ) target_compile_options(f90_ex_${example}-shared PRIVATE - $<$:"/dll"> + $<$:/dll> $<$:${WIN_COMPILE_FLAGS}> ) target_link_libraries (f90_ex_${example}-shared @@ -111,7 +111,7 @@ foreach (example ${F2003_examples}) ) target_compile_options(f03_ex_${example}-shared PRIVATE - $<$:"/dll"> + $<$:/dll> $<$:${WIN_COMPILE_FLAGS}> ) target_link_libraries (f03_ex_${example}-shared @@ -159,7 +159,7 @@ if (H5_HAVE_PARALLEL AND MPI_Fortran_FOUND) ) target_compile_options(f90_ex_ph5example-shared PRIVATE - $<$:"/dll"> + $<$:/dll> $<$:${WIN_COMPILE_FLAGS}> ) target_link_libraries (f90_ex_ph5example-shared diff --git a/fortran/src/CMakeLists.txt b/fortran/src/CMakeLists.txt index 7959c05..4ab51d2 100644 --- a/fortran/src/CMakeLists.txt +++ b/fortran/src/CMakeLists.txt @@ -287,7 +287,7 @@ if (BUILD_SHARED_LIBS) "H5_BUILT_AS_DYNAMIC_LIB" PRIVATE $<$:"BUILD_HDF5_DLL;HDF5F90_WINDOWS"> - $<$:"/dll"> + $<$:/dll> $<$:${WIN_COMPILE_FLAGS}> ) target_link_libraries (${HDF5_F90_LIBSH_TARGET} diff --git a/fortran/test/CMakeLists.txt b/fortran/test/CMakeLists.txt index 13c16a5..e81fab7 100644 --- a/fortran/test/CMakeLists.txt +++ b/fortran/test/CMakeLists.txt @@ -153,7 +153,7 @@ if (BUILD_SHARED_LIBS) "H5_BUILT_AS_DYNAMIC_LIB" PRIVATE $<$:"BUILD_HDF5_TEST_DLL;HDF5F90_WINDOWS"> - $<$:"/dll"> + $<$:/dll> $<$:${WIN_COMPILE_FLAGS}> ) target_link_libraries (${HDF5_F90_TEST_LIBSH_TARGET} @@ -241,7 +241,7 @@ if (BUILD_SHARED_LIBS) ) target_compile_options(testhdf5_fortran-shared PRIVATE - $<$:"/dll"> + $<$:/dll> $<$:${WIN_COMPILE_FLAGS}> ) target_link_libraries (testhdf5_fortran-shared @@ -305,7 +305,7 @@ if (BUILD_SHARED_LIBS) ) target_compile_options(testhdf5_fortran_1_8-shared PRIVATE - $<$:"/dll"> + $<$:/dll> $<$:${WIN_COMPILE_FLAGS}> ) target_link_libraries (testhdf5_fortran_1_8-shared @@ -373,7 +373,7 @@ if (BUILD_SHARED_LIBS) ) target_compile_options(fortranlib_test_F03-shared PRIVATE - $<$:"/dll"> + $<$:/dll> $<$:${WIN_COMPILE_FLAGS}> ) target_link_libraries (fortranlib_test_F03-shared @@ -423,7 +423,7 @@ if (BUILD_SHARED_LIBS) ) target_compile_options(fflush1-shared PRIVATE - $<$:"/dll"> + $<$:/dll> $<$:${WIN_COMPILE_FLAGS}> ) target_link_libraries (fflush1-shared @@ -473,7 +473,7 @@ if (BUILD_SHARED_LIBS) ) target_compile_options(fflush2-shared PRIVATE - $<$:"/dll"> + $<$:/dll> $<$:${WIN_COMPILE_FLAGS}> ) target_link_libraries (fflush2-shared diff --git a/hl/fortran/src/CMakeLists.txt b/hl/fortran/src/CMakeLists.txt index 9764a65..9999261 100644 --- a/hl/fortran/src/CMakeLists.txt +++ b/hl/fortran/src/CMakeLists.txt @@ -190,7 +190,7 @@ if (BUILD_SHARED_LIBS) "H5_BUILT_AS_DYNAMIC_LIB" PRIVATE $<$:"BUILD_HDF5_HL_DLL;HDF5F90_WINDOWS"> - $<$:"/dll"> + $<$:/dll> $<$:${WIN_COMPILE_FLAGS}> ) target_link_libraries (${HDF5_HL_F90_LIBSH_TARGET} diff --git a/hl/fortran/test/CMakeLists.txt b/hl/fortran/test/CMakeLists.txt index 497ba7f..a639d9c 100644 --- a/hl/fortran/test/CMakeLists.txt +++ b/hl/fortran/test/CMakeLists.txt @@ -34,7 +34,7 @@ if (BUILD_SHARED_LIBS) ) target_compile_options(hl_f90_tstds-shared PRIVATE - $<$:"/dll"> + $<$:/dll> $<$:${WIN_COMPILE_FLAGS}> ) target_link_libraries (hl_f90_tstds-shared @@ -80,7 +80,7 @@ if (BUILD_SHARED_LIBS) ) target_compile_options(hl_f90_tstlite-shared PRIVATE - $<$:"/dll"> + $<$:/dll> $<$:${WIN_COMPILE_FLAGS}> ) target_link_libraries (hl_f90_tstlite-shared @@ -126,7 +126,7 @@ if (BUILD_SHARED_LIBS) ) target_compile_options(hl_f90_tstimage-shared PRIVATE - $<$:"/dll"> + $<$:/dll> $<$:${WIN_COMPILE_FLAGS}> ) target_link_libraries (hl_f90_tstimage-shared @@ -172,7 +172,7 @@ if (BUILD_SHARED_LIBS) ) target_compile_options(hl_f90_tsttable-shared PRIVATE - $<$:"/dll"> + $<$:/dll> $<$:${WIN_COMPILE_FLAGS}> ) target_link_libraries (hl_f90_tsttable-shared -- cgit v0.12