diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2014-05-14 19:50:28 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2014-05-14 19:50:28 (GMT) |
| commit | 21474f8eeef355d6f21403c14b7de5b54b4da064 (patch) | |
| tree | b6638b281f2052f43f59fd7f1701a570d672cd71 /c++ | |
| parent | 8f57e86ab9f53cb1770054e69784087695ac14af (diff) | |
| download | hdf5-21474f8eeef355d6f21403c14b7de5b54b4da064.zip hdf5-21474f8eeef355d6f21403c14b7de5b54b4da064.tar.gz hdf5-21474f8eeef355d6f21403c14b7de5b54b4da064.tar.bz2 | |
[svn-r25188] Implement change to cmake_ext_mod config folder
Tested: local linux
Diffstat (limited to 'c++')
| -rw-r--r-- | c++/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | c++/src/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | c++/test/CMakeTests.cmake | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/c++/CMakeLists.txt b/c++/CMakeLists.txt index 89426c5..63fc083 100644 --- a/c++/CMakeLists.txt +++ b/c++/CMakeLists.txt @@ -4,7 +4,7 @@ PROJECT (HDF5_CPP) #----------------------------------------------------------------------------- # Apply Definitions to compiler in this directory and below #----------------------------------------------------------------------------- -add_definitions (${HDF5_EXTRA_C_FLAGS}) +add_definitions (${HDF_EXTRA_C_FLAGS}) #----------------------------------------------------------------------------- # Shared/Static Libs @@ -18,7 +18,7 @@ endif (BUILD_SHARED_LIBS) #----------------------------------------------------------------------------- # Generate configure file #----------------------------------------------------------------------------- -configure_file (${HDF5_RESOURCES_DIR}/H5cxx_config.h.in +configure_file (${HDF_RESOURCES_DIR}/H5cxx_config.h.in ${HDF5_BINARY_DIR}/H5cxx_pubconf.h ) diff --git a/c++/src/CMakeLists.txt b/c++/src/CMakeLists.txt index 7a48260..b07ab2b 100644 --- a/c++/src/CMakeLists.txt +++ b/c++/src/CMakeLists.txt @@ -11,7 +11,7 @@ endif (BUILD_SHARED_LIBS) #----------------------------------------------------------------------------- # Generate configure file #----------------------------------------------------------------------------- -configure_file (${HDF5_RESOURCES_DIR}/H5cxx_config.h.in +configure_file (${HDF_RESOURCES_DIR}/H5cxx_config.h.in ${HDF5_BINARY_DIR}/H5cxx_pubconf.h ) diff --git a/c++/test/CMakeTests.cmake b/c++/test/CMakeTests.cmake index 147972f..1048ee7 100644 --- a/c++/test/CMakeTests.cmake +++ b/c++/test/CMakeTests.cmake @@ -57,7 +57,7 @@ if (HDF5_TEST_VFD) -D "TEST_EXPECT=${resultcode}" -D "TEST_OUTPUT=cpp_testhdf5" -D "TEST_FOLDER=${PROJECT_BINARY_DIR}" - -P "${HDF5_RESOURCES_DIR}/vfdTest.cmake" + -P "${HDF_RESOURCES_DIR}/vfdTest.cmake" ) set_tests_properties (CPP_VFD-${vfdname}-cpp_testhdf5 PROPERTIES DEPENDS CPP_VFD-${vfdname}-cpp_testhdf5-clear-objects) endif (NOT HDF5_ENABLE_USING_MEMCHECKER) |