diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2016-10-27 15:12:39 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2016-10-27 15:12:39 (GMT) |
| commit | c694644ce9aa5ab61f7e7001110f3e0fbdab2404 (patch) | |
| tree | ae30a9277a0e85357d337e11de6e7252459b8149 | |
| parent | 7f2a83b6ab250f925185ce6b828afe639c356236 (diff) | |
| download | hdf5-c694644ce9aa5ab61f7e7001110f3e0fbdab2404.zip hdf5-c694644ce9aa5ab61f7e7001110f3e0fbdab2404.tar.gz hdf5-c694644ce9aa5ab61f7e7001110f3e0fbdab2404.tar.bz2 | |
Split tools into src and test - update locations
| -rw-r--r-- | CMakeLists.txt | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index ea09493..b59943e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -188,8 +188,8 @@ set (HDF5_HL_SRC_DIR ${HDF5_SOURCE_DIR}/hl) set (HDF5_HL_CPP_SRC_DIR ${HDF5_SOURCE_DIR}/hl/c++) set (HDF5_HL_TOOLS_DIR ${HDF5_SOURCE_DIR}/hl/tools) set (HDF5_TOOLS_DIR ${HDF5_SOURCE_DIR}/tools) -set (HDF5_TOOLS_SRC_DIR ${HDF5_SOURCE_DIR}/tools) -set (HDF5_PERFORM_SRC_DIR ${HDF5_SOURCE_DIR}/tools/perform) +set (HDF5_TOOLS_SRC_DIR ${HDF5_SOURCE_DIR}/tools/src) +set (HDF5_PERFORM_SRC_DIR ${HDF5_SOURCE_DIR}/tools/src/perform) set (HDF5_F90_SRC_DIR ${HDF5_SOURCE_DIR}/fortran) set (HDF5_JAVA_JNI_SRC_DIR ${HDF5_SOURCE_DIR}/java/src/jni) set (HDF5_JAVA_HDF5_SRC_DIR ${HDF5_SOURCE_DIR}/java/src/hdf) @@ -750,7 +750,7 @@ endif (HDF5_ENABLE_THREADSAFE) #----------------------------------------------------------------------------- add_subdirectory (${HDF5_SOURCE_DIR}/src ${PROJECT_BINARY_DIR}/src) -if (HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "SVN" OR HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "TGZ") +if (HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "SVN" OR HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "GIT" OR HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "TGZ") if (ZLIB_FOUND AND ZLIB_USE_EXTERNAL) ADD_DEPENDENCIES (${HDF5_LIB_TARGET} ZLIB) if (BUILD_SHARED_LIBS) @@ -763,7 +763,7 @@ if (HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "SVN" OR HDF5_ALLOW_EXTERNAL_SUPPORT MAT add_dependencies (${HDF5_LIBSH_TARGET} SZIP) endif (BUILD_SHARED_LIBS) endif (SZIP_FOUND AND SZIP_USE_EXTERNAL) -endif (HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "SVN" OR HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "TGZ") +endif (HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "SVN" OR HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "GIT" OR HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "TGZ") #----------------------------------------------------------------------------- # Dashboard and Testing Settings |