diff options
author | Allen Byrne <50328838+byrnHDF@users.noreply.github.com> | 2024-01-04 18:06:36 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-01-04 18:06:36 (GMT) |
commit | a00d62f77a715b0b4b862a594d1d85f4a0e5296c (patch) | |
tree | a71df5a1d896a4db7afa61cf3632768ae960c4fd /HDF5Examples | |
parent | de3ee47a44ffa7876c1e823eef6045f7fde8e165 (diff) | |
download | hdf5-a00d62f77a715b0b4b862a594d1d85f4a0e5296c.zip hdf5-a00d62f77a715b0b4b862a594d1d85f4a0e5296c.tar.gz hdf5-a00d62f77a715b0b4b862a594d1d85f4a0e5296c.tar.bz2 |
Use props for includes and remove global includes (#3921)
Diffstat (limited to 'HDF5Examples')
-rw-r--r-- | HDF5Examples/CMakeLists.txt | 8 | ||||
-rw-r--r-- | HDF5Examples/FORTRAN/H5D/CMakeLists.txt | 6 | ||||
-rw-r--r-- | HDF5Examples/FORTRAN/H5G/CMakeLists.txt | 6 | ||||
-rw-r--r-- | HDF5Examples/FORTRAN/H5PAR/CMakeLists.txt | 7 | ||||
-rw-r--r-- | HDF5Examples/FORTRAN/H5T/CMakeLists.txt | 6 | ||||
-rw-r--r-- | HDF5Examples/JAVA/CMakeLists.txt | 4 | ||||
-rw-r--r-- | HDF5Examples/JAVA/H5D/CMakeLists.txt | 5 | ||||
-rw-r--r-- | HDF5Examples/JAVA/H5G/CMakeLists.txt | 5 | ||||
-rw-r--r-- | HDF5Examples/JAVA/H5J/CMakeLists.txt | 5 | ||||
-rw-r--r-- | HDF5Examples/JAVA/H5T/CMakeLists.txt | 5 |
10 files changed, 15 insertions, 42 deletions
diff --git a/HDF5Examples/CMakeLists.txt b/HDF5Examples/CMakeLists.txt index 63adad6..d8e02d5 100644 --- a/HDF5Examples/CMakeLists.txt +++ b/HDF5Examples/CMakeLists.txt @@ -36,10 +36,6 @@ message (STATUS "HDF5 H5_LIBVER_DIR: ${H5_LIBVER_DIR} HDF5_VERSION_MAJOR: ${HDF5 option (HDF_BUILD_JAVA "Build JAVA support" OFF) if (HDF_BUILD_JAVA) find_package (Java) - INCLUDE_DIRECTORIES ( - ${JAVA_INCLUDE_PATH} - ${JAVA_INCLUDE_PATH2} - ) include (${H5EX_RESOURCES_DIR}/UseJava.cmake) endif () @@ -120,7 +116,9 @@ if (HDF_ENABLE_THREADSAFE) set (H5EX_HDF5_LINK_LIBS ${H5EX_HDF5_LINK_LIBS} Threads::Threads) endif () -INCLUDE_DIRECTORIES (${H5EX_HDF5_INCLUDE_DIRS}) +set_directory_properties(PROPERTIES INCLUDE_DIRECTORIES + "${H5EX_HDF5_INCLUDE_DIRS}" +) #----------------------------------------------------------------------------- # Dashboard and Testing Settings diff --git a/HDF5Examples/FORTRAN/H5D/CMakeLists.txt b/HDF5Examples/FORTRAN/H5D/CMakeLists.txt index 0d7f5b5..a929ac3 100644 --- a/HDF5Examples/FORTRAN/H5D/CMakeLists.txt +++ b/HDF5Examples/FORTRAN/H5D/CMakeLists.txt @@ -9,10 +9,8 @@ project (HDF5Examples_FORTRAN_H5D Fortran) #----------------------------------------------------------------------------- # Setup include Directories #----------------------------------------------------------------------------- -INCLUDE_DIRECTORIES ( - ${CMAKE_Fortran_MODULE_DIRECTORY}${HDF_MOD_EXT} - ${PROJECT_BINARY_DIR} - ${CMAKE_LIBRARY_OUTPUT_DIRECTORY} +set_directory_properties(PROPERTIES INCLUDE_DIRECTORIES + "${CMAKE_Fortran_MODULE_DIRECTORY}${HDF_MOD_EXT};${HDF5_F90_BINARY_DIR};${PROJECT_BINARY_DIR};${CMAKE_LIBRARY_OUTPUT_DIRECTORY}" ) #----------------------------------------------------------------------------- diff --git a/HDF5Examples/FORTRAN/H5G/CMakeLists.txt b/HDF5Examples/FORTRAN/H5G/CMakeLists.txt index dc8888a..835eb04 100644 --- a/HDF5Examples/FORTRAN/H5G/CMakeLists.txt +++ b/HDF5Examples/FORTRAN/H5G/CMakeLists.txt @@ -9,10 +9,8 @@ project (HDF5Examples_FORTRAN_H5G Fortran) #----------------------------------------------------------------------------- # Setup include Directories #----------------------------------------------------------------------------- -INCLUDE_DIRECTORIES ( - ${CMAKE_Fortran_MODULE_DIRECTORY}${HDF_MOD_EXT} - ${PROJECT_BINARY_DIR} - ${CMAKE_LIBRARY_OUTPUT_DIRECTORY} +set_directory_properties(PROPERTIES INCLUDE_DIRECTORIES + "${CMAKE_Fortran_MODULE_DIRECTORY}${HDF_MOD_EXT};${HDF5_F90_BINARY_DIR};${PROJECT_BINARY_DIR};${CMAKE_LIBRARY_OUTPUT_DIRECTORY}" ) #----------------------------------------------------------------------------- diff --git a/HDF5Examples/FORTRAN/H5PAR/CMakeLists.txt b/HDF5Examples/FORTRAN/H5PAR/CMakeLists.txt index 866f3ef..87fe8ab 100644 --- a/HDF5Examples/FORTRAN/H5PAR/CMakeLists.txt +++ b/HDF5Examples/FORTRAN/H5PAR/CMakeLists.txt @@ -9,11 +9,8 @@ project (HDF5Examples_FORTRAN_H5PAR Fortran) #----------------------------------------------------------------------------- # Setup include Directories #----------------------------------------------------------------------------- -INCLUDE_DIRECTORIES ( - ${CMAKE_Fortran_MODULE_DIRECTORY}${HDF_MOD_EXT} - ${PROJECT_BINARY_DIR} - ${HDF5_F90_BINARY_DIR} - ${CMAKE_LIBRARY_OUTPUT_DIRECTORY} +set_directory_properties(PROPERTIES INCLUDE_DIRECTORIES + "${CMAKE_Fortran_MODULE_DIRECTORY}${HDF_MOD_EXT};${HDF5_F90_BINARY_DIR};${PROJECT_BINARY_DIR};${CMAKE_LIBRARY_OUTPUT_DIRECTORY}" ) #----------------------------------------------------------------------------- diff --git a/HDF5Examples/FORTRAN/H5T/CMakeLists.txt b/HDF5Examples/FORTRAN/H5T/CMakeLists.txt index 8462bbf..4ef2256 100644 --- a/HDF5Examples/FORTRAN/H5T/CMakeLists.txt +++ b/HDF5Examples/FORTRAN/H5T/CMakeLists.txt @@ -4,10 +4,8 @@ project (HDF5Examples_FORTRAN_H5T Fortran) #----------------------------------------------------------------------------- # Setup include Directories #----------------------------------------------------------------------------- -INCLUDE_DIRECTORIES ( - ${CMAKE_Fortran_MODULE_DIRECTORY}${HDF_MOD_EXT} - ${PROJECT_BINARY_DIR} - ${CMAKE_LIBRARY_OUTPUT_DIRECTORY} +set_directory_properties(PROPERTIES INCLUDE_DIRECTORIES + "${CMAKE_Fortran_MODULE_DIRECTORY}${HDF_MOD_EXT};${HDF5_F90_BINARY_DIR};${PROJECT_BINARY_DIR};${CMAKE_LIBRARY_OUTPUT_DIRECTORY}" ) #----------------------------------------------------------------------------- diff --git a/HDF5Examples/JAVA/CMakeLists.txt b/HDF5Examples/JAVA/CMakeLists.txt index 5063e5b..080e505 100644 --- a/HDF5Examples/JAVA/CMakeLists.txt +++ b/HDF5Examples/JAVA/CMakeLists.txt @@ -1,6 +1,10 @@ cmake_minimum_required (VERSION 3.18) project (HDFJAVA_EXAMPLES Java) +set_directory_properties(PROPERTIES INCLUDE_DIRECTORIES + "${HDFJAVA_LIB_DIR};${JAVA_INCLUDE_PATH};${JAVA_INCLUDE_PATH2}" +) + add_subdirectory (H5D) add_subdirectory (H5T) add_subdirectory (H5G) diff --git a/HDF5Examples/JAVA/H5D/CMakeLists.txt b/HDF5Examples/JAVA/H5D/CMakeLists.txt index 017830b..d5b3b85 100644 --- a/HDF5Examples/JAVA/H5D/CMakeLists.txt +++ b/HDF5Examples/JAVA/H5D/CMakeLists.txt @@ -3,11 +3,6 @@ project (HDF5Examples_JAVA_H5D Java) set (CMAKE_VERBOSE_MAKEFILE 1) -set_directory_properties(PROPERTIES - INCLUDE_DIRECTORIES - "${HDFJAVA_LIB_DIR};${JAVA_INCLUDE_PATH};${JAVA_INCLUDE_PATH2}" -) - #----------------------------------------------------------------------------- # Define Sources #----------------------------------------------------------------------------- diff --git a/HDF5Examples/JAVA/H5G/CMakeLists.txt b/HDF5Examples/JAVA/H5G/CMakeLists.txt index bd43f2a..ac35a3a 100644 --- a/HDF5Examples/JAVA/H5G/CMakeLists.txt +++ b/HDF5Examples/JAVA/H5G/CMakeLists.txt @@ -3,11 +3,6 @@ project (HDF5Examples_JAVA_GROUPS Java) set (CMAKE_VERBOSE_MAKEFILE 1) -set_directory_properties(PROPERTIES - INCLUDE_DIRECTORIES - "${HDFJAVA_LIB_DIR};${JAVA_INCLUDE_PATH};${JAVA_INCLUDE_PATH2}" -) - #----------------------------------------------------------------------------- # Define Sources #----------------------------------------------------------------------------- diff --git a/HDF5Examples/JAVA/H5J/CMakeLists.txt b/HDF5Examples/JAVA/H5J/CMakeLists.txt index 1bd28a1..6d15565 100644 --- a/HDF5Examples/JAVA/H5J/CMakeLists.txt +++ b/HDF5Examples/JAVA/H5J/CMakeLists.txt @@ -3,11 +3,6 @@ project (HDF5Examples_JAVA_INTRO Java) set (CMAKE_VERBOSE_MAKEFILE 1) -set_directory_properties(PROPERTIES - INCLUDE_DIRECTORIES - "${HDFJAVA_LIB_DIR};${JAVA_INCLUDE_PATH};${JAVA_INCLUDE_PATH2}" -) - #----------------------------------------------------------------------------- # Define Sources #----------------------------------------------------------------------------- diff --git a/HDF5Examples/JAVA/H5T/CMakeLists.txt b/HDF5Examples/JAVA/H5T/CMakeLists.txt index 1c06804..d8c8220 100644 --- a/HDF5Examples/JAVA/H5T/CMakeLists.txt +++ b/HDF5Examples/JAVA/H5T/CMakeLists.txt @@ -3,11 +3,6 @@ project (HDF5Examples_JAVA_H5T Java) set (CMAKE_VERBOSE_MAKEFILE 1) -set_directory_properties(PROPERTIES - INCLUDE_DIRECTORIES - "${HDFJAVA_LIB_DIR};${JAVA_INCLUDE_PATH};${JAVA_INCLUDE_PATH2}" -) - #----------------------------------------------------------------------------- # Define Sources #----------------------------------------------------------------------------- |