diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2014-04-22 19:02:40 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2014-04-22 19:02:40 (GMT) |
| commit | 2fc0c50a9dee7aaf810c210068e702d54ec7a3b2 (patch) | |
| tree | 9ed7b8b24274e2cf919c2478861c0faad43ee3a8 | |
| parent | 3bd99b85badc4bdfc7452d90dfab941a994da29b (diff) | |
| download | hdf5-2fc0c50a9dee7aaf810c210068e702d54ec7a3b2.zip hdf5-2fc0c50a9dee7aaf810c210068e702d54ec7a3b2.tar.gz hdf5-2fc0c50a9dee7aaf810c210068e702d54ec7a3b2.tar.bz2 | |
[svn-r25076] Correct the install folder logic.
Tested: local linux
| -rw-r--r-- | CMakeInstallation.cmake | 4 | ||||
| -rw-r--r-- | CMakeLists.txt | 20 | ||||
| -rw-r--r-- | release_docs/INSTALL_Cygwin.txt | 2 |
3 files changed, 4 insertions, 22 deletions
diff --git a/CMakeInstallation.cmake b/CMakeInstallation.cmake index 0604802..83ba252 100644 --- a/CMakeInstallation.cmake +++ b/CMakeInstallation.cmake @@ -292,10 +292,8 @@ if (NOT HDF5_EXTERNALLY_CONFIGURED AND NOT HDF5_NO_PACKAGES) elseif (APPLE) LIST (APPEND CPACK_GENERATOR "DragNDrop") set (CPACK_COMPONENTS_ALL_IN_ONE_PACKAGE ON) - set (CPACK_PACKAGE_DEFAULT_LOCATION "/opt/${CPACK_PACKAGE_NAME}") - set (CPACK_PACKAGING_INSTALL_PREFIX "/") + set (CPACK_PACKAGING_INSTALL_PREFIX "/${CPACK_PACKAGE_INSTALL_DIRECTORY}") set (CPACK_PACKAGE_ICON "${HDF5_RESOURCES_DIR}/hdf.icns") - set (CPACK_SET_DESTDIR TRUE) # Required when packaging, and set CMAKE_INSTALL_PREFIX to "/". if (HDF5_PACK_MACOSX_BUNDLE) LIST (APPEND CPACK_GENERATOR "Bundle") diff --git a/CMakeLists.txt b/CMakeLists.txt index 2cf05cd..a82dcfa 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -213,22 +213,6 @@ 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) @@ -716,7 +700,7 @@ endif (NOT HDF5_EXTERNALLY_CONFIGURED) # Note: Currently CMake only allows configuring of threadsafe on # non-Cygwin WINDOWS. #----------------------------------------------------------------------------- -if (WIN32 AND NOT CYGWIN) +if (WIN32) option (HDF5_ENABLE_THREADSAFE "Enable thread-safety" OFF) if (HDF5_ENABLE_THREADSAFE) # check for unsupported options @@ -743,7 +727,7 @@ if (WIN32 AND NOT CYGWIN) endif (NOT H5_HAVE_PTHREAD_H) endif (H5_HAVE_IOEO) endif (HDF5_ENABLE_THREADSAFE) -endif (WIN32 AND NOT CYGWIN) +endif (WIN32) #----------------------------------------------------------------------------- # Add the HDF5 Library Target to the build diff --git a/release_docs/INSTALL_Cygwin.txt b/release_docs/INSTALL_Cygwin.txt index d78cd85..a7e5f67 100644 --- a/release_docs/INSTALL_Cygwin.txt +++ b/release_docs/INSTALL_Cygwin.txt @@ -234,7 +234,7 @@ Install HDF5 on Cygwin 8. Known Problems dt_arith tests may fail due to the use of fork. This is a known issue - with cygwin on windows. + with cygwin on Windows. ----------------------------------------------------------------------- |