diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2016-10-14 18:51:00 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2016-10-14 18:51:00 (GMT) |
| commit | 6de1836e477ddfa255812df8325405a741e002f4 (patch) | |
| tree | 0a1500ba37e175353ca1f626c1fca217ecdbcb8a /release_docs/USING_HDF5_CMake.txt | |
| parent | f0a356a90324e9542b2272df7e695a5a365dbb13 (diff) | |
| parent | 321db89a65909c02d7279fed7e8b7a3585cde8da (diff) | |
| download | hdf5-6de1836e477ddfa255812df8325405a741e002f4.zip hdf5-6de1836e477ddfa255812df8325405a741e002f4.tar.gz hdf5-6de1836e477ddfa255812df8325405a741e002f4.tar.bz2 | |
Merge pull request #2 in ~BYRN/hdf5_adb from bugfix/HDFFV-10003-examples-project-fails-to-build to develop
* commit '321db89a65909c02d7279fed7e8b7a3585cde8da':
Remove test only tools from exports
Fix typo
Correct typo in variable format
Description: Fixed typo that caused daily test failed when --enable-deprecated-symbols is used. Also, removed a commented-out function. Platforms tested: Linux/32 2.6 (jam) Linux/64 (platypus) with --enable-deprecated-symbols
Description: Added test file titerate.cpp. Platform tested: Verified with bin/chkmanifest
Description: Removed commented out lines. Platform tested Jam (only comments)
Purpose: Fix bug HDFFR-9920 cont. Description: Added new test file titerate.cpp.
Fix:HDFFV-9987 With HDF5-1.10 you cannot specify default dataspace for Fortran (H5S_ALL_F)
Removed unused H5T_NATIVE_INTEGER_# variables due to NAG fixes.
Purpose: Updated documentation Description: Revised class brief description and other comments for up-to-date info. Platforms tested: Linux/32 2.6 (jam) Linux/64 (platypus) Darwin (osx1010test)
Purpose: Fix bug HDFFR-9920 cont. Description: Adding user's test revealed a flaw in the fix. Moved CommonFG's functions in Group to H5Location, so that they could be called by objects that can be used to specify a location Also, rearranged many "#include" header files to resolve conflicts.
Add support for namespace and add tools to binaries config
Diffstat (limited to 'release_docs/USING_HDF5_CMake.txt')
| -rw-r--r-- | release_docs/USING_HDF5_CMake.txt | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/release_docs/USING_HDF5_CMake.txt b/release_docs/USING_HDF5_CMake.txt index e89f1eb..313af83 100644 --- a/release_docs/USING_HDF5_CMake.txt +++ b/release_docs/USING_HDF5_CMake.txt @@ -183,15 +183,19 @@ source root. Include the following text in the file: cmake_minimum_required (VERSION 3.1.0) project (HDF5MyApp C CXX) -find_package (HDF5 NAMES hdf5 COMPONENTS C static) +set (LIB_TYPE STATIC) # or SHARED +string(TOLOWER ${LIB_TYPE} SEARCH_TYPE) + +find_package (HDF5 NAMES hdf5 COMPONENTS C ${SEARCH_TYPE}) # find_package (HDF5) # Find non-cmake built HDF5 INCLUDE_DIRECTORIES (${HDF5_INCLUDE_DIR}) -set (LINK_LIBS ${LINK_LIBS} ${HDF5_C_STATIC_LIBRARY}) +set (LINK_LIBS ${LINK_LIBS} ${HDF5_C_${LIB_TYPE}_LIBRARY}) set (example hdf_example) add_executable (${example} ${PROJECT_SOURCE_DIR}/${example}.c) -TARGET_C_PROPERTIES (${example} " " " ") +TARGET_NAMING (${example} ${LIB_TYPE}) +TARGET_C_PROPERTIES (${example} ${LIB_TYPE} " " " ") target_link_libraries (${example} ${LINK_LIBS}) enable_testing () |