diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2018-11-01 18:37:07 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2018-11-01 18:37:07 (GMT) |
| commit | 02f0ede8a34cbfeb4ae74e1b0c074775ad0515ca (patch) | |
| tree | df794c5b89b81addc04637c4f7a044a072ed2281 /hl | |
| parent | fed235056602a3e9aec0303b9afe23ef183e2693 (diff) | |
| download | hdf5-02f0ede8a34cbfeb4ae74e1b0c074775ad0515ca.zip hdf5-02f0ede8a34cbfeb4ae74e1b0c074775ad0515ca.tar.gz hdf5-02f0ede8a34cbfeb4ae74e1b0c074775ad0515ca.tar.bz2 | |
Add missing SKIP_HDF5_FORTRAN_SHARED to all fortran cmake
Diffstat (limited to 'hl')
| -rw-r--r-- | hl/fortran/src/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | hl/fortran/test/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | hl/fortran/test/CMakeTests.cmake | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/hl/fortran/src/CMakeLists.txt b/hl/fortran/src/CMakeLists.txt index 8a4b32d..e90253b 100644 --- a/hl/fortran/src/CMakeLists.txt +++ b/hl/fortran/src/CMakeLists.txt @@ -103,7 +103,7 @@ H5_SET_LIB_OPTIONS (${HDF5_HL_F90_LIB_TARGET} ${HDF5_HL_F90_LIB_NAME} STATIC 0) set_global_variable (HDF5_LIBRARIES_TO_EXPORT "${HDF5_LIBRARIES_TO_EXPORT};${HDF5_HL_F90_LIB_TARGET}") set (install_targets ${install_targets} ${HDF5_HL_F90_LIB_TARGET}) -if (BUILD_SHARED_LIBS) +if (BUILD_SHARED_LIBS AND NOT SKIP_HDF5_FORTRAN_SHARED) add_library (${HDF5_HL_F90_LIBSH_TARGET} SHARED ${HDF5_HL_F90_F_SRCS}) target_include_directories (${HDF5_HL_F90_LIBSH_TARGET} PRIVATE diff --git a/hl/fortran/test/CMakeLists.txt b/hl/fortran/test/CMakeLists.txt index 508528a..c41ab2e 100644 --- a/hl/fortran/test/CMakeLists.txt +++ b/hl/fortran/test/CMakeLists.txt @@ -39,7 +39,7 @@ macro (ADD_H5_FORTRAN_EXE file) FOLDER test/hl/fortran Fortran_MODULE_DIRECTORY ${CMAKE_Fortran_MODULE_DIRECTORY}/static ) - if (BUILD_SHARED_LIBS) + if (BUILD_SHARED_LIBS AND NOT SKIP_HDF5_FORTRAN_SHARED) add_executable (hl_f90_${file}-shared ${file}.f90) target_include_directories (hl_f90_${file}-shared PRIVATE diff --git a/hl/fortran/test/CMakeTests.cmake b/hl/fortran/test/CMakeTests.cmake index 7974668..0278163 100644 --- a/hl/fortran/test/CMakeTests.cmake +++ b/hl/fortran/test/CMakeTests.cmake @@ -32,7 +32,7 @@ macro (ADD_H5_FORTRAN_TEST file) ) endif () set_tests_properties (HL_FORTRAN_f90_${file} PROPERTIES DEPENDS HL_FORTRAN_test-clear-objects) - if (BUILD_SHARED_LIBS) + if (BUILD_SHARED_LIBS AND NOT SKIP_HDF5_FORTRAN_SHARED) if (HDF5_ENABLE_USING_MEMCHECKER) add_test (NAME HL_FORTRAN_f90_${file}-shared COMMAND $<TARGET_FILE:hl_f90_${file}-shared>) else () @@ -66,7 +66,7 @@ add_test ( tstds.h5 ) -if (BUILD_SHARED_LIBS) +if (BUILD_SHARED_LIBS AND NOT SKIP_HDF5_FORTRAN_SHARED) add_test ( NAME HL_FORTRAN_test-shared-clear-objects COMMAND ${CMAKE_COMMAND} |