TRILABS-19 Initial conversion of include_directories to targets

8 files changed, 5 insertions, 34 deletions

diff --git a/java/CMakeLists.txt b/java/CMakeLists.txt
index fc057f7..4684827 100644
--- a/java/CMakeLists.txt
+++ b/java/CMakeLists.txt
@@ -13,7 +13,6 @@ find_package (JNI)
 message ("JNI_LIBRARIES=${JNI_LIBRARIES}")
 message ("JNI_INCLUDE_DIRS=${JNI_INCLUDE_DIRS}")
 
-INCLUDE_DIRECTORIES ( ${JNI_INCLUDE_DIRS} )
 
 if (WIN32)
   set (HDF_JRE_DIRECTORY "C:/Program Files/Java/jre8")
@@ -25,11 +24,12 @@ endif ()
 # Include the main src and config directories
 #-----------------------------------------------------------------------------
 set (HDF5_JAVA_INCLUDE_DIRECTORIES
+    ${JNI_INCLUDE_DIRS}
     ${HDF5_JAVA_JNI_SRC_DIR}
     ${JAVA_INCLUDE_PATH}
     ${JAVA_INCLUDE_PATH2}
 )
-INCLUDE_DIRECTORIES (${HDF5_JAVA_INCLUDE_DIRECTORIES})
+set_directory_properties(PROPERTIES INCLUDE_DIRECTORIES "${HDF5_JAVA_INCLUDE_DIRECTORIES}")
 set (CMAKE_JAVA_INCLUDE_PATH "")
 
 
diff --git a/java/examples/datasets/CMakeLists.txt b/java/examples/datasets/CMakeLists.txt
index 6a90cd1..8b86a54 100644
--- a/java/examples/datasets/CMakeLists.txt
+++ b/java/examples/datasets/CMakeLists.txt
@@ -3,11 +3,6 @@ PROJECT (HDFJAVA_EXAMPLES_DATASETS Java)
 
 set (CMAKE_VERBOSE_MAKEFILE 1)
 
-INCLUDE_DIRECTORIES (
-    ${HDF5_JAVA_JNI_BINARY_DIR}
-    ${HDF5_JAVA_HDF5_LIB_DIR}
-)
-
 set (HDF_JAVA_EXAMPLES
     H5Ex_D_Alloc
     H5Ex_D_Checksum
diff --git a/java/examples/datatypes/CMakeLists.txt b/java/examples/datatypes/CMakeLists.txt
index 73111ed..47baedd 100644
--- a/java/examples/datatypes/CMakeLists.txt
+++ b/java/examples/datatypes/CMakeLists.txt
@@ -3,11 +3,6 @@ PROJECT (HDFJAVA_EXAMPLES_DATATYPES Java)
 
 set (CMAKE_VERBOSE_MAKEFILE 1)
 
-INCLUDE_DIRECTORIES (
-    ${HDF5_JAVA_JNI_BINARY_DIR}
-    ${HDF5_JAVA_HDF5_LIB_DIR}
-)
-
 set (HDF_JAVA_EXAMPLES
     H5Ex_T_Array
     H5Ex_T_ArrayAttribute
diff --git a/java/examples/groups/CMakeLists.txt b/java/examples/groups/CMakeLists.txt
index 6b55359..3fb977d 100644
--- a/java/examples/groups/CMakeLists.txt
+++ b/java/examples/groups/CMakeLists.txt
@@ -3,11 +3,6 @@ PROJECT (HDFJAVA_EXAMPLES_GROUPS Java)
 
 set (CMAKE_VERBOSE_MAKEFILE 1)
 
-INCLUDE_DIRECTORIES (
-    ${HDF5_JAVA_JNI_BINARY_DIR}
-    ${HDF5_JAVA_HDF5_LIB_DIR}
-)
-
 set (HDF_JAVA_EXAMPLES
     H5Ex_G_Create
     H5Ex_G_Iterate
diff --git a/java/examples/intro/CMakeLists.txt b/java/examples/intro/CMakeLists.txt
index 65db3fe..da753bb 100644
--- a/java/examples/intro/CMakeLists.txt
+++ b/java/examples/intro/CMakeLists.txt
@@ -3,11 +3,6 @@ PROJECT (HDFJAVA_EXAMPLES_INTRO Java)
 
 set (CMAKE_VERBOSE_MAKEFILE 1)
 
-INCLUDE_DIRECTORIES (
-    ${HDF5_JAVA_JNI_BINARY_DIR}
-    ${HDF5_JAVA_HDF5_LIB_DIR}
-)
-
 set (HDF_JAVA_EXAMPLES
     H5_CreateAttribute
     H5_CreateDataset
diff --git a/java/src/hdf/hdf5lib/CMakeLists.txt b/java/src/hdf/hdf5lib/CMakeLists.txt
index 9506fc1..bf64de3 100644
--- a/java/src/hdf/hdf5lib/CMakeLists.txt
+++ b/java/src/hdf/hdf5lib/CMakeLists.txt
@@ -3,12 +3,7 @@ PROJECT (HDF5_JAVA_HDF_HDF5 Java)
 
 set (CMAKE_VERBOSE_MAKEFILE 1)
 
-INCLUDE_DIRECTORIES (
-    ${HDF5_JAVA_HDF_HDF5_SOURCE_DIR}
-    ${HDF5_JAVA_HDF_HDF5_BINARY_DIR}
-    ${HDF5_JAVA_LIB_DIR}
-    ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/${HDF5_JAVA_HDF5_LIB_CORENAME}.dir/hdf/hdf5lib
-)
+set_directory_properties(PROPERTIES INCLUDE_DIRECTORIES "${HDF5_JAVA_HDF_HDF5_SOURCE_DIR};${HDF5_JAVA_HDF_HDF5_BINARY_DIR};${HDF5_JAVA_LIB_DIR};${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/${HDF5_JAVA_HDF5_LIB_CORENAME}.dir/hdf/hdf5lib")
 
 SET_GLOBAL_VARIABLE (HDF5_JAVA_SOURCE_PACKAGES
     "${HDF5_JAVA_SOURCE_PACKAGES};hdf.hdf5lib.callbacks;hdf.hdf5lib.exceptions;hdf.hdf5lib.structs;hdf.hdf5lib"
diff --git a/java/src/jni/CMakeLists.txt b/java/src/jni/CMakeLists.txt
index 21e9d22..b3517cc 100644
--- a/java/src/jni/CMakeLists.txt
+++ b/java/src/jni/CMakeLists.txt
@@ -44,12 +44,11 @@ set (HDF5_JAVA_JNI_CHDRS
     ${HDF5_JAVA_JNI_SOURCE_DIR}/nativeData.h
 )
 
-INCLUDE_DIRECTORIES( ${HDF5_JAVA_JNI_SOURCE_DIR} )
-
 set (CMAKE_INCLUDE_CURRENT_DIR_IN_INTERFACE ON)
 
 ########### JNI libraries always must be built shared  ###############
 add_library (${HDF5_JAVA_JNI_LIB_TARGET} SHARED ${HDF5_JAVA_JNI_CSRCS} ${HDF5_JAVA_JNI_CHDRS})
+target_include_directories(${HDF5_JAVA_JNI_LIB_TARGET} PRIVATE ${HDF5_BINARY_DIR} ${HDF5_JAVA_JNI_SOURCE_DIR})
 TARGET_C_PROPERTIES (${HDF5_JAVA_JNI_LIB_TARGET} SHARED " " " ")
 target_link_libraries (${HDF5_JAVA_JNI_LIB_TARGET} PUBLIC ${HDF5_LIB_TARGET})
 set_target_properties (${HDF5_JAVA_JNI_LIB_TARGET} PROPERTIES FOLDER libraries/jni)
diff --git a/java/test/CMakeLists.txt b/java/test/CMakeLists.txt
index c48cf01..31da30e 100644
--- a/java/test/CMakeLists.txt
+++ b/java/test/CMakeLists.txt
@@ -3,10 +3,7 @@ PROJECT (HDF5_JAVA_TEST Java)
 
 set (CMAKE_VERBOSE_MAKEFILE 1)
 
-INCLUDE_DIRECTORIES (
-    ${HDF5_JAVA_JNI_BINARY_DIR}
-    ${HDF5_JAVA_HDF5_LIB_DIR}
-)
+set_directory_properties(PROPERTIES INCLUDE_DIRECTORIES "${HDF5_JAVA_JNI_BINARY_DIR};${HDF5_JAVA_HDF5_LIB_DIR}")
 
 set (HDF5_JAVA_TEST_SOURCES
     TestH5.java