diff options
author | Allen Byrne <byrn@hdfgroup.org> | 2018-04-24 15:25:13 (GMT) |
---|---|---|
committer | Allen Byrne <byrn@hdfgroup.org> | 2018-04-24 15:25:13 (GMT) |
commit | b3c5284692093953132c6c8227e0980b670bf4ad (patch) | |
tree | 84cc1f217108c4585586ffd6e74782cbe91734ed /java/CMakeLists.txt | |
parent | fa829e322ed44a67e2b3f2d6adf1306ad794859b (diff) | |
parent | f435ed67fa53ca35462a60f4025464465d7dc9d0 (diff) | |
download | hdf5-b3c5284692093953132c6c8227e0980b670bf4ad.zip hdf5-b3c5284692093953132c6c8227e0980b670bf4ad.tar.gz hdf5-b3c5284692093953132c6c8227e0980b670bf4ad.tar.bz2 |
Merge pull request #1038 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit 'f435ed67fa53ca35462a60f4025464465d7dc9d0':
TRILABS-20 set a compiler name on all project commands
TRILABS-19 All c code INCLUDE_DIRECTORIES converted
TRILABS-19 Initial conversion of include_directories to targets
Diffstat (limited to 'java/CMakeLists.txt')
-rw-r--r-- | java/CMakeLists.txt | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/java/CMakeLists.txt b/java/CMakeLists.txt index fc057f7..ffc3b94 100644 --- a/java/CMakeLists.txt +++ b/java/CMakeLists.txt @@ -1,8 +1,9 @@ cmake_minimum_required (VERSION 3.10) -PROJECT ( HDF5_JAVA C Java ) +project (HDF5_JAVA C Java) set (CMAKE_MODULE_PATH "${HDF_RESOURCES_DIR};${HDF_RESOURCES_EXT_DIR}") find_package (Java) + #----------------------------------------------------------------------------- # Include some macros for reusable code #----------------------------------------------------------------------------- @@ -13,7 +14,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,13 +25,14 @@ 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 (CMAKE_JAVA_INCLUDE_PATH "") +set_directory_properties(PROPERTIES INCLUDE_DIRECTORIES "${HDF5_JAVA_INCLUDE_DIRECTORIES}") +set (CMAKE_JAVA_INCLUDE_PATH "") #----------------------------------------------------------------------------- # Traverse source subdirectory |