diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2018-05-09 18:45:44 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2018-05-09 18:45:44 (GMT) |
| commit | dcc66a4f157ace0858b788228550f3e104df3242 (patch) | |
| tree | e60eaa27df6d6bc80a32d6a73d329c41c423eb54 /src/CMakeLists.txt | |
| parent | 7aeebec9463d18c3040ba7fa37464c00b64ab75e (diff) | |
| parent | d6ea76ac002cd8483ba8a6aaf55bbce5ed552937 (diff) | |
| download | hdf5-dcc66a4f157ace0858b788228550f3e104df3242.zip hdf5-dcc66a4f157ace0858b788228550f3e104df3242.tar.gz hdf5-dcc66a4f157ace0858b788228550f3e104df3242.tar.bz2 | |
Merge pull request #1049 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit 'd6ea76ac002cd8483ba8a6aaf55bbce5ed552937':
GGC requires attribute before function
Correct COMPILE defs usage
Add missing module_dir property
Diffstat (limited to 'src/CMakeLists.txt')
| -rw-r--r-- | src/CMakeLists.txt | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 70e18a2..9ff70f9 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -905,8 +905,8 @@ target_compile_definitions(${HDF5_LIB_TARGET} ${HDF_EXTRA_FLAGS} $<IF:$<CONFIG:Debug>,DEBUG,NDEBUG> PRIVATE - $<$<BOOL:${HDF5_ENABLE_TRACE}>:"H5_DEBUG_API"> # Enable tracing of the API - $<$<BOOL:${HDF5_ENABLE_DEBUG_APIS}>:"H5Z_DEBUG;H5T_DEBUG;H5ST_DEBUG;H5S_DEBUG;H5O_DEBUG;H5I_DEBUG;H5HL_DEBUG;H5F_DEBUG;H5D_DEBUG;H5B2_DEBUG;H5AC_DEBUG"> + $<$<BOOL:${HDF5_ENABLE_TRACE}>:H5_DEBUG_API> # Enable tracing of the API + $<$<BOOL:${HDF5_ENABLE_DEBUG_APIS}>:H5Z_DEBUG;H5T_DEBUG;H5ST_DEBUG;H5S_DEBUG;H5O_DEBUG;H5I_DEBUG;H5HL_DEBUG;H5F_DEBUG;H5D_DEBUG;H5B2_DEBUG;H5AC_DEBUG> ) TARGET_C_PROPERTIES (${HDF5_LIB_TARGET} STATIC) target_link_libraries (${HDF5_LIB_TARGET} @@ -948,9 +948,9 @@ if (BUILD_SHARED_LIBS) ${HDF_EXTRA_FLAGS} $<IF:$<CONFIG:Debug>,DEBUG,NDEBUG> PRIVATE - $<$<BOOL:${HDF5_ENABLE_THREADSAFE}>:"H5_HAVE_THREADSAFE"> - $<$<BOOL:${HDF5_ENABLE_TRACE}>:"H5_DEBUG_API"> # Enable tracing of the API - $<$<BOOL:${HDF5_ENABLE_DEBUG_APIS}>:"H5Z_DEBUG;H5T_DEBUG;H5ST_DEBUG;H5S_DEBUG;H5O_DEBUG;H5I_DEBUG;H5HL_DEBUG;H5F_DEBUG;H5D_DEBUG;H5B2_DEBUG;H5AC_DEBUG"> + $<$<BOOL:${HDF5_ENABLE_THREADSAFE}>:H5_HAVE_THREADSAFE> + $<$<BOOL:${HDF5_ENABLE_TRACE}>:H5_DEBUG_API> # Enable tracing of the API + $<$<BOOL:${HDF5_ENABLE_DEBUG_APIS}>:H5Z_DEBUG;H5T_DEBUG;H5ST_DEBUG;H5S_DEBUG;H5O_DEBUG;H5I_DEBUG;H5HL_DEBUG;H5F_DEBUG;H5D_DEBUG;H5B2_DEBUG;H5AC_DEBUG> ) TARGET_C_PROPERTIES (${HDF5_LIBSH_TARGET} SHARED) target_link_libraries (${HDF5_LIBSH_TARGET} |