diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2017-01-13 20:45:30 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2017-01-13 20:45:30 (GMT) |
| commit | 509b6c24a7793b8fddd15a6abb6f9573f7adae3e (patch) | |
| tree | 1b82e8b527b8de093f8f29e42332296c8ee4c8f7 /java/src | |
| parent | bd85e57904f1f943774bb99ea5e8b0d074db0edb (diff) | |
| parent | 110073450f84fb373a6f28579cdc5751c3eca3b0 (diff) | |
| download | hdf5-509b6c24a7793b8fddd15a6abb6f9573f7adae3e.zip hdf5-509b6c24a7793b8fddd15a6abb6f9573f7adae3e.tar.gz hdf5-509b6c24a7793b8fddd15a6abb6f9573f7adae3e.tar.bz2 | |
Merge pull request #251 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit '110073450f84fb373a6f28579cdc5751c3eca3b0':
Add unused -parameters to developer group.
Add addition hint info about option
Correct variable name
Missing file remove added to test
Update developer flags to account for gcc version
Move Windows level 4 warnings to developer option
Fix test output file name
Changed severity of message state
Remove duplicate command
CMake command cleanup
HDFFV-10094: upgrade cmake command conventions Also converted tests to use macros
Update cmake min version and cmake command convention
Diffstat (limited to 'java/src')
| -rw-r--r-- | java/src/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | java/src/hdf/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | java/src/hdf/hdf5lib/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | java/src/jni/CMakeLists.txt | 8 |
4 files changed, 8 insertions, 8 deletions
diff --git a/java/src/CMakeLists.txt b/java/src/CMakeLists.txt index ae78201..3f93f39 100644 --- a/java/src/CMakeLists.txt +++ b/java/src/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.1.0) +cmake_minimum_required(VERSION 3.2.2) PROJECT ( HDF5_JAVA_SRC C Java ) #----------------------------------------------------------------------------- diff --git a/java/src/hdf/CMakeLists.txt b/java/src/hdf/CMakeLists.txt index f465da9..84bda53 100644 --- a/java/src/hdf/CMakeLists.txt +++ b/java/src/hdf/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required (VERSION 3.1.0) +cmake_minimum_required (VERSION 3.2.2) PROJECT (HDF5_JAVA_HDF) add_subdirectory (${HDF5_JAVA_HDF_SOURCE_DIR}/hdf5lib hdf5lib) diff --git a/java/src/hdf/hdf5lib/CMakeLists.txt b/java/src/hdf/hdf5lib/CMakeLists.txt index 5362c44..c856c04 100644 --- a/java/src/hdf/hdf5lib/CMakeLists.txt +++ b/java/src/hdf/hdf5lib/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required (VERSION 3.1.0) +cmake_minimum_required (VERSION 3.2.2) PROJECT (HDF5_JAVA_HDF_HDF5 Java) set (CMAKE_VERBOSE_MAKEFILE 1) @@ -105,7 +105,7 @@ add_jar (${HDF5_JAVA_HDF5_LIB_TARGET} OUTPUT_NAME "${HDF5_JAVA_HDF5_LIB_TARGET}- install_jar (${HDF5_JAVA_HDF5_LIB_TARGET} LIBRARY DESTINATION ${HDF5_INSTALL_JAR_DIR} COMPONENT libraries) #if (NOT WIN32) # install_jni_symlink (${HDF5_JAVA_HDF5_LIB_TARGET} ${HDF5_INSTALL_JAR_DIR} libraries) -#endif (NOT WIN32) +#endif () get_target_property (${HDF5_JAVA_HDF5_LIB_TARGET}_JAR_FILE ${HDF5_JAVA_HDF5_LIB_TARGET} JAR_FILE) SET_GLOBAL_VARIABLE (HDF5_JAVA_JARS_TO_EXPORT "${HDF5_JAVA_JARS_TO_EXPORT};${${HDF5_JAVA_HDF5_LIB_TARGET}_JAR_FILE}") diff --git a/java/src/jni/CMakeLists.txt b/java/src/jni/CMakeLists.txt index 9da31ee..882588b 100644 --- a/java/src/jni/CMakeLists.txt +++ b/java/src/jni/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required (VERSION 3.1.0) +cmake_minimum_required (VERSION 3.2.2) PROJECT (HDF5_JAVA_JNI C CXX) set (HDF5_JAVA_JNI_CSRCS @@ -67,8 +67,8 @@ if (WIN32) COMMENT "Copying ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${CMAKE_CFG_INTDIR}/${HDF5_JAVA_JNI_DLL_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX} to ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/" ) add_dependencies (HDF5_JAVA_JNI-Test-Copy ${HDF5_JAVA_JNI_LIB_TARGET}) - endif (BUILD_TESTING) -endif (WIN32) + endif () +endif () #----------------------------------------------------------------------------- # Add Target(s) to CMake Install for import into other projects @@ -86,4 +86,4 @@ if (HDF5_EXPORTED_TARGETS) FRAMEWORK DESTINATION ${HDF5_INSTALL_FWRK_DIR} COMPONENT libraries INCLUDES DESTINATION include ) -endif (HDF5_EXPORTED_TARGETS) +endif () |