diff options
| author | Allen Byrne <50328838+byrnHDF@users.noreply.github.com> | 2020-12-16 18:17:12 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-16 18:17:12 (GMT) |
| commit | 3114e5f4a49131ca1e26cbf1e614f7e867a20285 (patch) | |
| tree | 68cde408dd4200442d88046cecabb038ce8cee80 /fortran | |
| parent | a84a29566c22ab46146f8127ea4289937c59c526 (diff) | |
| download | hdf5-3114e5f4a49131ca1e26cbf1e614f7e867a20285.zip hdf5-3114e5f4a49131ca1e26cbf1e614f7e867a20285.tar.gz hdf5-3114e5f4a49131ca1e26cbf1e614f7e867a20285.tar.bz2 | |
HDF5 1 8 fix fortran build on macs (#186)
* Correct fortran and shared libs option
* Fix for no shared fortran build
Diffstat (limited to 'fortran')
| -rw-r--r-- | fortran/examples/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | fortran/test/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | fortran/testpar/CMakeLists.txt | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/fortran/examples/CMakeLists.txt b/fortran/examples/CMakeLists.txt index 610ee8c..2092dbe 100644 --- a/fortran/examples/CMakeLists.txt +++ b/fortran/examples/CMakeLists.txt @@ -41,7 +41,7 @@ foreach (example ${examples}) if(MSVC) set_property(TARGET f90_ex_${example} PROPERTY LINK_FLAGS "/SUBSYSTEM:CONSOLE ${WIN_LINK_FLAGS}") endif() - if (NOT BUILD_SHARED_LIBS) + if (NOT ONLY_SHARED_LIBS) target_include_directories (f90_ex_${example} PRIVATE "${CMAKE_Fortran_MODULE_DIRECTORY}/static" diff --git a/fortran/test/CMakeLists.txt b/fortran/test/CMakeLists.txt index 10fb66d..6a4bef1 100644 --- a/fortran/test/CMakeLists.txt +++ b/fortran/test/CMakeLists.txt @@ -57,7 +57,7 @@ endif () # Add Target to clang-format #----------------------------------------------------------------------------- if (HDF5_ENABLE_FORMATTERS) - if (NOT BUILD_SHARED_LIBS) + if (NOT ONLY_SHARED_LIBS) clang_format (HDF5_FORTRAN_TESTS_FORMAT ${HDF5_F90_C_TEST_LIB_TARGET}) else () clang_format (HDF5_FORTRAN_TESTS_FORMAT ${HDF5_F90_C_TEST_LIBSH_TARGET}) diff --git a/fortran/testpar/CMakeLists.txt b/fortran/testpar/CMakeLists.txt index 12489528..e527f98 100644 --- a/fortran/testpar/CMakeLists.txt +++ b/fortran/testpar/CMakeLists.txt @@ -5,7 +5,7 @@ project (HDF5_FORTRAN_TESTPAR C Fortran) # Setup include Directories #----------------------------------------------------------------------------- set (TESTPAR_INCLUDES ${MPI_Fortran_INCLUDE_DIRS} ${HDF5_F90_BINARY_DIR} ${HDF5_F90_SRC_DIR}/src)) -if (NOT BUILD_SHARED_LIBS) +if (NOT ONLY_SHARED_LIBS) set (TESTPAR_INCLUDES ${TESTPAR_INCLUDES} ${CMAKE_Fortran_MODULE_DIRECTORY}/static) else () set (TESTPAR_INCLUDES ${TESTPAR_INCLUDES} ${CMAKE_Fortran_MODULE_DIRECTORY}/shared) @@ -29,7 +29,7 @@ target_compile_options(parallel_test "${HDF5_CMAKE_Fortran_FLAGS}" $<$<STREQUAL:"x${CMAKE_Fortran_SIMULATE_ID}","xMSVC">:${WIN_COMPILE_FLAGS}> ) -if (NOT BUILD_SHARED_LIBS) +if (NOT ONLY_SHARED_LIBS) target_link_libraries (parallel_test PRIVATE ${HDF5_F90_TEST_LIB_TARGET} ${HDF5_F90_LIB_TARGET} ${HDF5_LIB_TARGET} ${LINK_Fortran_LIBS} |