diff options
| author | Allen Byrne <50328838+byrnHDF@users.noreply.github.com> | 2023-12-21 15:53:24 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-21 15:53:24 (GMT) |
| commit | aa734a5d7e19c0eb9232e55a2f257fd87ffee0f1 (patch) | |
| tree | 4ae5cdc2ab39a1b73813203c194c72c9abcd3a42 /HDF5Examples/config/cmake/HDFExampleMacros.cmake | |
| parent | 773245a0847e6b482f28b919fe4ed29b0f366834 (diff) | |
| download | hdf5-aa734a5d7e19c0eb9232e55a2f257fd87ffee0f1.zip hdf5-aa734a5d7e19c0eb9232e55a2f257fd87ffee0f1.tar.gz hdf5-aa734a5d7e19c0eb9232e55a2f257fd87ffee0f1.tar.bz2 | |
Add VDS examples and fix non-standalone build (#3898)
* Choose a size for rdata dimension
* Fix platform naming conflicts
* Fix doxygen references to point within library repo
Diffstat (limited to 'HDF5Examples/config/cmake/HDFExampleMacros.cmake')
| -rw-r--r-- | HDF5Examples/config/cmake/HDFExampleMacros.cmake | 35 |
1 files changed, 1 insertions, 34 deletions
diff --git a/HDF5Examples/config/cmake/HDFExampleMacros.cmake b/HDF5Examples/config/cmake/HDFExampleMacros.cmake index 82fd8ac..3bb1d48 100644 --- a/HDF5Examples/config/cmake/HDFExampleMacros.cmake +++ b/HDF5Examples/config/cmake/HDFExampleMacros.cmake @@ -21,23 +21,10 @@ macro (BASIC_SETTINGS varname) set (CMAKE_NO_SYSTEM_FROM_IMPORTED 1) #----------------------------------------------------------------------------- - # Define some CMake variables for use later in the project - #----------------------------------------------------------------------------- - set (${EXAMPLE_PACKAGE_NAME}_RESOURCES_DIR ${${EXAMPLE_PACKAGE_NAME}_SOURCE_DIR}/config/cmake) - set (${EXAMPLE_PACKAGE_NAME}_SRC_DIR ${${EXAMPLE_PACKAGE_NAME}_SOURCE_DIR}/src) - - #----------------------------------------------------------------------------- # Setup output Directories #----------------------------------------------------------------------------- SET_HDF_OUTPUT_DIRS(${EXAMPLE_PACKAGE_NAME}) - #----------------------------------------------------------------------------- - # Option to use Shared/Static libs, default is static - #----------------------------------------------------------------------------- - set (LIB_TYPE STATIC) - if (BUILD_SHARED_LIBS) - set (LIB_TYPE SHARED) - endif () set (CMAKE_POSITION_INDEPENDENT_CODE ON) if (MSVC) @@ -116,24 +103,10 @@ macro (BASIC_SETTINGS varname) set (${EXAMPLE_PACKAGE_NAME}_INCLUDES_BUILD_TIME ${${EXAMPLE_PACKAGE_NAME}_SRC_DIR} ${${EXAMPLE_PACKAGE_NAME}_BINARY_DIR} ) - - #----------------------------------------------------------------------------- - # Option to build JAVA examples - #----------------------------------------------------------------------------- - option (HDF_BUILD_JAVA "Build JAVA support" OFF) - if (HDF_BUILD_JAVA) - find_package (Java) - INCLUDE_DIRECTORIES ( - ${JAVA_INCLUDE_PATH} - ${JAVA_INCLUDE_PATH2} - ) - - include (${${EXAMPLE_PACKAGE_NAME}_RESOURCES_DIR}/UseJava.cmake) - endif () endmacro () macro (HDF5_SUPPORT) - set (CMAKE_MODULE_PATH ${${EXAMPLE_PACKAGE_NAME}_RESOURCES_DIR} ${CMAKE_MODULE_PATH}) + set (CMAKE_MODULE_PATH ${H5EX_RESOURCES_DIR} ${CMAKE_MODULE_PATH}) option (USE_SHARED_LIBS "Use Shared Libraries" ON) if (NOT H5EX_HDF5_HEADER) @@ -273,12 +246,6 @@ macro (HDF5_SUPPORT) list (APPEND H5EX_HDF5_INCLUDE_DIRS ${HDF5_INCLUDE_DIR_FORTRAN}) endif () message (STATUS "HDF5 link libs: ${H5EX_HDF5_LINK_LIBS} Includes: ${H5EX_HDF5_INCLUDE_DIRS}") - - if (USE_SHARED_LIBS) - set (H5_LIB_TYPE SHARED) - else () - set (H5_LIB_TYPE STATIC) - endif () endmacro () #------------------------------------------------------------------------------- |