diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2016-10-14 16:46:02 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2016-10-14 16:46:02 (GMT) |
| commit | bb94c5efded35655aa32441355d85a3ccd0158ab (patch) | |
| tree | f2e298aa30f04ed2791cdc1bcae0726bc11e69e0 /fortran | |
| parent | baecf9c5e6dc0358d1188657bc6a9695a61db431 (diff) | |
| parent | 052ca6a74199005efe7f324f2a3ac508b18cdc27 (diff) | |
| download | hdf5-bb94c5efded35655aa32441355d85a3ccd0158ab.zip hdf5-bb94c5efded35655aa32441355d85a3ccd0158ab.tar.gz hdf5-bb94c5efded35655aa32441355d85a3ccd0158ab.tar.bz2 | |
Merge pull request #67 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit '052ca6a74199005efe7f324f2a3ac508b18cdc27':
Correct name and usage of cmake variable
Add STGZ to mac cpack list
Merge from master cmake_conf project
Diffstat (limited to 'fortran')
| -rw-r--r-- | fortran/src/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | fortran/test/CMakeLists.txt | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/fortran/src/CMakeLists.txt b/fortran/src/CMakeLists.txt index d4ca791..c3af6ea 100644 --- a/fortran/src/CMakeLists.txt +++ b/fortran/src/CMakeLists.txt @@ -67,13 +67,13 @@ set_target_properties (H5_buildiface PROPERTIES if (BUILD_SHARED_LIBS AND NOT SKIP_HDF5_FORTRAN_SHARED) file (MAKE_DIRECTORY "${HDF5_F90_BINARY_DIR}/shared") if (WIN32) - set (MODSH_BUILD_DIR ${CMAKE_Fortran_MODULE_DIRECTORY}/shared/\${BUILD_TYPE}) + set (MODSH_BUILD_DIR ${CMAKE_Fortran_MODULE_DIRECTORY}/shared/${CMAKE_BUILD_TYPE}) else (WIN32) set (MODSH_BUILD_DIR ${CMAKE_Fortran_MODULE_DIRECTORY}/shared) endif (WIN32) endif (BUILD_SHARED_LIBS AND NOT SKIP_HDF5_FORTRAN_SHARED) if (WIN32) - set (MOD_BUILD_DIR ${CMAKE_Fortran_MODULE_DIRECTORY}/static/\${BUILD_TYPE}) + set (MOD_BUILD_DIR ${CMAKE_Fortran_MODULE_DIRECTORY}/static/$CMAKE_BUILD_TYPE}) else (WIN32) set (MOD_BUILD_DIR ${CMAKE_Fortran_MODULE_DIRECTORY}/static) endif (WIN32) diff --git a/fortran/test/CMakeLists.txt b/fortran/test/CMakeLists.txt index 219f937..5b11a0a 100644 --- a/fortran/test/CMakeLists.txt +++ b/fortran/test/CMakeLists.txt @@ -35,13 +35,13 @@ set_target_properties (H5_test_buildiface PROPERTIES if (BUILD_SHARED_LIBS AND NOT SKIP_HDF5_FORTRAN_SHARED) file (MAKE_DIRECTORY "${HDF5_F90_BINARY_DIR}/shared") if (WIN32) - set (MODSH_BUILD_DIR ${CMAKE_Fortran_MODULE_DIRECTORY}/shared/\${BUILD_TYPE}) + set (MODSH_BUILD_DIR ${CMAKE_Fortran_MODULE_DIRECTORY}/shared/${CMAKE_BUILD_TYPE}) else (WIN32) set (MODSH_BUILD_DIR ${CMAKE_Fortran_MODULE_DIRECTORY}/shared) endif (WIN32) endif (BUILD_SHARED_LIBS AND NOT SKIP_HDF5_FORTRAN_SHARED) if (WIN32) - set (MOD_BUILD_DIR ${CMAKE_Fortran_MODULE_DIRECTORY}/static/\${BUILD_TYPE}) + set (MOD_BUILD_DIR ${CMAKE_Fortran_MODULE_DIRECTORY}/static/${CMAKE_BUILD_TYPE}) else (WIN32) set (MOD_BUILD_DIR ${CMAKE_Fortran_MODULE_DIRECTORY}/static) endif (WIN32) |