diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2019-12-10 21:33:37 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2019-12-10 21:33:37 (GMT) |
| commit | 1670bd01bc1f9e2c9eead2fb742dde6a6cc50ec7 (patch) | |
| tree | 025797850e277a358ed4af9aaebc99b1ce632175 | |
| parent | c58108ea4030e74a0b745cabbc8ccd366695de07 (diff) | |
| parent | 5109ff1d84df2a4ee0493c196399e89e9fd0c10b (diff) | |
| download | hdf5-1670bd01bc1f9e2c9eead2fb742dde6a6cc50ec7.zip hdf5-1670bd01bc1f9e2c9eead2fb742dde6a6cc50ec7.tar.gz hdf5-1670bd01bc1f9e2c9eead2fb742dde6a6cc50ec7.tar.bz2 | |
Merge pull request #2106 in HDFFV/hdf5 from ~BYRN/hdf5_adb:hdf5_1_10 to hdf5_1_10
* commit '5109ff1d84df2a4ee0493c196399e89e9fd0c10b':
Add missing include folder
Remove unneeded flag overwrites
| -rwxr-xr-x | config/cmake/scripts/HDF5config.cmake | 8 | ||||
| -rw-r--r-- | java/src/jni/CMakeLists.txt | 2 |
2 files changed, 1 insertions, 9 deletions
diff --git a/config/cmake/scripts/HDF5config.cmake b/config/cmake/scripts/HDF5config.cmake index def5417..44e6208 100755 --- a/config/cmake/scripts/HDF5config.cmake +++ b/config/cmake/scripts/HDF5config.cmake @@ -180,14 +180,6 @@ if (NOT DEFINED HPC) set (ENV{CC} "${XCODE_CC}") set (ENV{CXX} "${XCODE_CXX}") set (CTEST_USE_LAUNCHERS 1) - set (RR_WARNINGS_COMMON "-Wno-format-nonliteral -Wno-cast-align -Wno-unused -Wno-unused-variable -Wno-unused-function -Wno-self-assign -Wno-unused-parameter -Wno-sign-compare") - set (RR_WARNINGS_C "${RR_WARNINGS_COMMON} -Wno-deprecated-declarations -Wno-uninitialized") - set (RR_WARNINGS_CXX "${RR_WARNINGS_COMMON} -Woverloaded-virtual -Wshadow -Wwrite-strings -Wc++11-compat") - set (RR_FLAGS_COMMON "-g -O0 -fstack-protector-all -D_FORTIFY_SOURCE=2") - set (RR_FLAGS_C "${RR_FLAGS_COMMON}") - set (RR_FLAGS_CXX "${RR_FLAGS_COMMON}") - set (ENV{CFLAGS} "${RR_WARNINGS_C} ${RR_FLAGS_C}") - set (ENV{CXXFLAGS} "${RR_WARNINGS_CXX} ${RR_FLAGS_CXX}") endif () endif () else () diff --git a/java/src/jni/CMakeLists.txt b/java/src/jni/CMakeLists.txt index f3e6012..366f091 100644 --- a/java/src/jni/CMakeLists.txt +++ b/java/src/jni/CMakeLists.txt @@ -75,7 +75,7 @@ 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};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>" + PRIVATE "${HDF5_SRC_DIR};${HDF5_BINARY_DIR};${HDF5_JAVA_JNI_SOURCE_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>" ) TARGET_C_PROPERTIES (${HDF5_JAVA_JNI_LIB_TARGET} SHARED) target_link_libraries (${HDF5_JAVA_JNI_LIB_TARGET} PUBLIC ${HDF5_LIBSH_TARGET}) |