diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2018-01-29 17:33:11 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2018-01-29 17:33:11 (GMT) |
| commit | 9e311657771d7aaa59bf941d6d6494369f4181ff (patch) | |
| tree | d203d6cab754613ebef151da930add296ca2d695 /fortran | |
| parent | b0cb6af193c76935b91f1b14ed03bbd748c9b212 (diff) | |
| download | hdf5-9e311657771d7aaa59bf941d6d6494369f4181ff.zip hdf5-9e311657771d7aaa59bf941d6d6494369f4181ff.tar.gz hdf5-9e311657771d7aaa59bf941d6d6494369f4181ff.tar.bz2 | |
Fix windows and mac compile issues
Diffstat (limited to 'fortran')
| -rw-r--r-- | fortran/src/CMakeLists.txt | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/fortran/src/CMakeLists.txt b/fortran/src/CMakeLists.txt index 4d98b81..59acaf0 100644 --- a/fortran/src/CMakeLists.txt +++ b/fortran/src/CMakeLists.txt @@ -4,7 +4,7 @@ PROJECT (HDF5_F90_SRC C CXX Fortran) #----------------------------------------------------------------------------- # configure def file for shared libs on windows if (WIN32) - if (BUILD_SHARED_LIBS) + if (BUILD_SHARED_LIBS AND NOT SKIP_HDF5_FORTRAN_SHARED) if (MSVC) if (NOT H5_HAVE_PARALLEL) set (H5_NOPAREXP ";") @@ -58,7 +58,7 @@ else () endif () endif () if (WIN32 AND MSVC) - if (BUILD_SHARED_LIBS) + if (BUILD_SHARED_LIBS AND NOT SKIP_HDF5_FORTRAN_SHARED) set_target_properties (H5test_FortranHavekind-shared PROPERTIES COMPILE_FLAGS "/MT" @@ -93,7 +93,7 @@ add_executable (H5fortran_detect ${HDF5_F90_BINARY_DIR}/H5fortran_detect.f90 ) if (WIN32 AND MSVC) - if (BUILD_SHARED_LIBS) + if (BUILD_SHARED_LIBS AND NOT SKIP_HDF5_FORTRAN_SHARED) set_target_properties (H5fortran_detect PROPERTIES COMPILE_FLAGS "/MT" @@ -139,7 +139,7 @@ add_custom_command ( ) set_source_files_properties (${HDF5_F90_BINARY_DIR}/static/H5f90i_gen.h PROPERTIES GENERATED TRUE) set_source_files_properties (${HDF5_F90_BINARY_DIR}/static/H5fortran_types.f90 PROPERTIES GENERATED TRUE) -if (BUILD_SHARED_LIBS) +if (BUILD_SHARED_LIBS AND NOT SKIP_HDF5_FORTRAN_SHARED) set (CMDSH $<TARGET_FILE:H5match_types>) add_custom_command ( OUTPUT ${HDF5_F90_BINARY_DIR}/shared/H5f90i_gen.h @@ -197,7 +197,7 @@ set_target_properties (${HDF5_F90_C_LIB_TARGET} PROPERTIES ) set (install_targets ${HDF5_F90_C_LIB_TARGET}) -if (BUILD_SHARED_LIBS) +if (BUILD_SHARED_LIBS AND NOT SKIP_HDF5_FORTRAN_SHARED) add_library (${HDF5_F90_C_LIBSH_TARGET} SHARED ${f90CStub_C_SOURCES} ${f90CStub_C_SHHDRS}) target_include_directories(${HDF5_F90_C_LIBSH_TARGET} PUBLIC ${HDF5_F90_BINARY_DIR}/shared) TARGET_C_PROPERTIES (${HDF5_F90_C_LIBSH_TARGET} SHARED " " " ") |