diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2016-05-04 15:06:05 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2016-05-04 15:06:05 (GMT) |
| commit | 74f3326a67da158d8a808f92c59cae6e762c7c21 (patch) | |
| tree | 5e67766a57e87d3d1f7af0486a677c48bb8f5e2c /c++ | |
| parent | 2e3e3f9cd362e89d5a9f7847607d86690a32edab (diff) | |
| download | hdf5-74f3326a67da158d8a808f92c59cae6e762c7c21.zip hdf5-74f3326a67da158d8a808f92c59cae6e762c7c21.tar.gz hdf5-74f3326a67da158d8a808f92c59cae6e762c7c21.tar.bz2 | |
[svn-r29862] Convert source list names from *_SRCS to *_SOURCES.
Add/convert most tools to use new HDF5_TOOLS_DIR instead of HDF5_TOOLS_SRC_DIR CMake VAR.
Diffstat (limited to 'c++')
| -rw-r--r-- | c++/src/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | c++/test/CMakeLists.txt | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/c++/src/CMakeLists.txt b/c++/src/CMakeLists.txt index 1a182e3..526b223 100644 --- a/c++/src/CMakeLists.txt +++ b/c++/src/CMakeLists.txt @@ -11,7 +11,7 @@ configure_file (${HDF_RESOURCES_DIR}/H5cxx_config.h.in #----------------------------------------------------------------------------- # Define cpp Library #----------------------------------------------------------------------------- -set (CPP_SRCS +set (CPP_SOURCES ${HDF5_CPP_SRC_SOURCE_DIR}/H5AbstractDs.cpp ${HDF5_CPP_SRC_SOURCE_DIR}/H5ArrayType.cpp ${HDF5_CPP_SRC_SOURCE_DIR}/H5AtomType.cpp @@ -78,7 +78,7 @@ set (CPP_HDRS ${HDF5_CPP_SRC_SOURCE_DIR}/H5VarLenType.h ) -add_library (${HDF5_CPP_LIB_TARGET} STATIC ${CPP_SRCS} ${CPP_HDRS}) +add_library (${HDF5_CPP_LIB_TARGET} STATIC ${CPP_SOURCES} ${CPP_HDRS}) TARGET_C_PROPERTIES (${HDF5_CPP_LIB_TARGET} STATIC " " " ") target_link_libraries (${HDF5_CPP_LIB_TARGET} ${HDF5_LIB_TARGET}) set_global_variable (HDF5_LIBRARIES_TO_EXPORT "${HDF5_LIBRARIES_TO_EXPORT};${HDF5_CPP_LIB_TARGET}") @@ -90,7 +90,7 @@ set_target_properties (${HDF5_CPP_LIB_TARGET} PROPERTIES set (install_targets ${HDF5_CPP_LIB_TARGET}) if (BUILD_SHARED_LIBS) - add_library (${HDF5_CPP_LIBSH_TARGET} SHARED ${CPP_SRCS} ${CPP_HDRS}) + add_library (${HDF5_CPP_LIBSH_TARGET} SHARED ${CPP_SOURCES} ${CPP_HDRS}) TARGET_C_PROPERTIES (${HDF5_CPP_LIBSH_TARGET} SHARED " " " ") target_link_libraries (${HDF5_CPP_LIBSH_TARGET} ${HDF5_LIBSH_TARGET}) set_global_variable (HDF5_LIBRARIES_TO_EXPORT "${HDF5_LIBRARIES_TO_EXPORT};${HDF5_CPP_LIBSH_TARGET}") diff --git a/c++/test/CMakeLists.txt b/c++/test/CMakeLists.txt index 4bebeac..dffe7a4 100644 --- a/c++/test/CMakeLists.txt +++ b/c++/test/CMakeLists.txt @@ -11,7 +11,7 @@ PROJECT (HDF5_CPP_TEST) #----------------------------------------------------------------------------- # Define Sources #----------------------------------------------------------------------------- -set (CPP_TEST_SRCS +set (CPP_TEST_SOURCES ${HDF5_CPP_TEST_SOURCE_DIR}/testhdf5.cpp ${HDF5_CPP_TEST_SOURCE_DIR}/tarray.cpp ${HDF5_CPP_TEST_SOURCE_DIR}/tattr.cpp @@ -35,7 +35,7 @@ set (CPP_TEST_SRCS set (srcdir ${CMAKE_CURRENT_SOURCE_DIR}) configure_file (${HDF5_CPP_TEST_SOURCE_DIR}/H5srcdir_str.h.in H5srcdir_str.h @ONLY) -add_executable (cpp_testhdf5 ${CPP_TEST_SRCS} ) +add_executable (cpp_testhdf5 ${CPP_TEST_SOURCES} ) TARGET_NAMING (cpp_testhdf5 STATIC) TARGET_C_PROPERTIES (cpp_testhdf5 STATIC " " " ") target_link_libraries (cpp_testhdf5 |