diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2014-02-11 20:22:16 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2014-02-11 20:22:16 (GMT) |
| commit | ab045c634cac0219939b93a1d2b829e7b1f3e7a1 (patch) | |
| tree | 0789c0e58da23ed2599bde5e287be47149b4e7d6 | |
| parent | 1b6683e58f81d81d1f0b9aad115fa9ab404693b2 (diff) | |
| download | hdf5-ab045c634cac0219939b93a1d2b829e7b1f3e7a1.zip hdf5-ab045c634cac0219939b93a1d2b829e7b1f3e7a1.tar.gz hdf5-ab045c634cac0219939b93a1d2b829e7b1f3e7a1.tar.bz2 | |
[svn-r24700] Updated packaging process to align with latest hdf cmake standards.
| -rw-r--r-- | CMakeLists.txt | 16 | ||||
| -rw-r--r-- | config/cmake/H5pubconf.h.in | 4 | ||||
| -rw-r--r-- | config/cmake/HDF518_Examples.cmake.in | 2 |
3 files changed, 19 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index d443d78..73d6d8e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -213,6 +213,22 @@ SET (HDF5_PACKAGE_URL "http://www.hdfgroup.org") SET (HDF5_PACKAGE_BUGREPORT "help@hdfgroup.org") #----------------------------------------------------------------------------- +# Set Install folder value +#----------------------------------------------------------------------------- +IF (CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) + IF(CMAKE_HOST_UNIX) + SET(CMAKE_INSTALL_PREFIX "/HDF_Group/${HDF5_PACKAGE_NAME}/${HDF5_PACKAGE_VERSION}" + CACHE PATH "Install path prefix, prepended onto install directories." FORCE) + ELSE(CMAKE_HOST_UNIX) + GetDefaultWindowsPrefixBase(CMAKE_GENERIC_PROGRAM_FILES) + SET(CMAKE_INSTALL_PREFIX + "${CMAKE_GENERIC_PROGRAM_FILES}/HDF_Group/${HDF5_PACKAGE_NAME}/${HDF5_PACKAGE_VERSION}" + CACHE PATH "Install path prefix, prepended onto install directories." FORCE) + SET(CMAKE_GENERIC_PROGRAM_FILES) + ENDIF(CMAKE_HOST_UNIX) +ENDIF (CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) + +#----------------------------------------------------------------------------- # Include some macros for reusable code #----------------------------------------------------------------------------- INCLUDE (${HDF5_RESOURCES_DIR}/HDFMacros.cmake) diff --git a/config/cmake/H5pubconf.h.in b/config/cmake/H5pubconf.h.in index 287fa0f..f3e1d75 100644 --- a/config/cmake/H5pubconf.h.in +++ b/config/cmake/H5pubconf.h.in @@ -569,7 +569,7 @@ #define H5_PACKAGE_URL "@HDF5_PACKAGE_URL@" /* Define to the version of this package. */ -#define H5_PACKAGE_VERSION "@HDF5_PACKAGE_VERSION@" +#define H5_PACKAGE_VERSION "@HDF5_PACKAGE_VERSION_STRING@" /* Width for printf() for type `long long' or `__int64', use `ll' */ #cmakedefine H5_PRINTF_LL_WIDTH @H5_PRINTF_LL_WIDTH@ @@ -754,7 +754,7 @@ #cmakedefine H5_USING_MEMCHECKER @H5_USING_MEMCHECKER@ /* Version number of package */ -#define H5_VERSION "@HDF5_PACKAGE_VERSION@" +#define H5_VERSION "@HDF5_PACKAGE_VERSION_STRING@" /* Define if vsnprintf() returns the correct value for formatted strings that don't fit into size allowed */ diff --git a/config/cmake/HDF518_Examples.cmake.in b/config/cmake/HDF518_Examples.cmake.in index 1883d3e..075920e 100644 --- a/config/cmake/HDF518_Examples.cmake.in +++ b/config/cmake/HDF518_Examples.cmake.in @@ -5,7 +5,7 @@ cmake_minimum_required(VERSION 2.8.10 FATAL_ERROR) # ctest -S HDF518_Examples.cmake,HDF5Examples-0.1.1-Source -C Release -O test.log
###############################################################################################################
-set(INSTALLDIR "@CMAKE_INSTALL_PREFIX@/HDF_Group/@HDF5_PACKAGE_NAME@/@HDF5_PACKAGE_VERSION@")
+set(INSTALLDIR "@CMAKE_INSTALL_PREFIX@")
set(CTEST_CMAKE_GENERATOR "@CMAKE_GENERATOR@")
set(STATICLIBRARIES "@H5_ENABLE_STATIC_LIB@")
set(CTEST_SOURCE_NAME ${CTEST_SCRIPT_ARG})
|