summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAllen Byrne <byrn@hdfgroup.org>2013-01-07 14:23:48 (GMT)
committerAllen Byrne <byrn@hdfgroup.org>2013-01-07 14:23:48 (GMT)
commit6fd9729b82e870ec497270f4c5796c02064c1d0e (patch)
tree0893f3d35f0cead114fc42f9431d9110102b4f62
parentc1b0e4f686de8fa13e703bb3a222ce3301fa019f (diff)
downloadhdf5-6fd9729b82e870ec497270f4c5796c02064c1d0e.zip
hdf5-6fd9729b82e870ec497270f4c5796c02064c1d0e.tar.gz
hdf5-6fd9729b82e870ec497270f4c5796c02064c1d0e.tar.bz2
[svn-r23137] HDFFV-8227: Add Message to stop configure id SHARED FORTRAN is selected.
Also added APPLE cpack section Corrected FATAL to FATAL_ERROR in MESSAGEs Tested: duck
-rw-r--r--CMakeLists.txt15
1 files changed, 11 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3ddef9b..aff3f86 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -666,7 +666,7 @@ IF (WIN32 AND NOT CYGWIN)
IF (HDF5_ENABLE_THREADSAFE)
# check for unsupported options
IF (HDF5_ENABLE_PARALLEL)
- MESSAGE (FATAL " **** Parallel and Threadsafe options are mutually exclusive **** ")
+ MESSAGE (FATAL_ERROR " **** Parallel and Threadsafe options are mutually exclusive **** ")
ENDIF (HDF5_ENABLE_PARALLEL)
SET (H5_HAVE_THREADSAFE 1)
IF (H5_HAVE_IOEO)
@@ -675,7 +675,7 @@ IF (WIN32 AND NOT CYGWIN)
ELSE (H5_HAVE_IOEO)
IF (NOT H5_HAVE_PTHREAD_H)
SET (H5_HAVE_THREADSAFE 0)
- MESSAGE (FATAL " **** Threadsafe option requires thread library **** ")
+ MESSAGE (FATAL_ERROR " **** Threadsafe option requires thread library **** ")
ENDIF (NOT H5_HAVE_PTHREAD_H)
ENDIF (H5_HAVE_IOEO)
ENDIF (HDF5_ENABLE_THREADSAFE)
@@ -757,6 +757,9 @@ SET (H5_FC_FUNC_ "H5_FC_FUNC_(name,NAME) name ## _")
IF (EXISTS "${HDF5_SOURCE_DIR}/fortran" AND IS_DIRECTORY "${HDF5_SOURCE_DIR}/fortran")
OPTION (HDF5_BUILD_FORTRAN "Build FORTRAN support" OFF)
IF (HDF5_BUILD_FORTRAN)
+ IF (BUILD_SHARED_LIBS AND APPLE)
+ MESSAGE (FATAL_ERROR " **** Shared FORTRAN libraries are unsupported **** ")
+ ENDIF (BUILD_SHARED_LIBS AND APPLE)
OPTION (HDF5_ENABLE_F2003 "Enable FORTRAN 2003 Standard" OFF)
INCLUDE (${HDF5_RESOURCES_DIR}/HDF5UseFortran.cmake)
IF (HDF5_ENABLE_F2003)
@@ -798,7 +801,7 @@ IF (EXISTS "${HDF5_SOURCE_DIR}/c++" AND IS_DIRECTORY "${HDF5_SOURCE_DIR}/c++")
IF (HDF5_BUILD_CPP_LIB)
# check for unsupported options
IF (HDF5_ENABLE_PARALLEL)
- MESSAGE (FATAL " **** Parallel and C++ options are mutually exclusive **** ")
+ MESSAGE (FATAL_ERROR " **** Parallel and C++ options are mutually exclusive **** ")
ENDIF (HDF5_ENABLE_PARALLEL)
IF (CMAKE_NO_STD_NAMESPACE)
SET (H5_NO_STD 1)
@@ -999,7 +1002,6 @@ IF (NOT HDF5_EXTERNALLY_CONFIGURED AND NOT HDF5_NO_PACKAGES)
SET (CPACK_PACKAGE_VENDOR "HDF_Group")
SET (CPACK_PACKAGE_NAME "${HDF5_PACKAGE_NAME}")
SET (CPACK_PACKAGE_INSTALL_DIRECTORY "${HDF5_PACKAGE_NAME}")
- SET (CPACK_PACKAGE_INSTALL_REGISTRY_KEY "${HDF5_PACKAGE_NAME}-${HDF5_PACKAGE_VERSION}-${LIB_TYPE}")
SET (CPACK_PACKAGE_VERSION "${HDF5_PACKAGE_VERSION}")
SET (CPACK_PACKAGE_VERSION_MAJOR "${HDF5_PACKAGE_VERSION_MAJOR}")
SET (CPACK_PACKAGE_VERSION_MINOR "${HDF5_PACKAGE_VERSION_MINOR}")
@@ -1012,10 +1014,15 @@ IF (NOT HDF5_EXTERNALLY_CONFIGURED AND NOT HDF5_NO_PACKAGES)
SET (CPACK_PACKAGE_RELOCATABLE TRUE)
IF (WIN32)
+ SET (CPACK_PACKAGE_INSTALL_REGISTRY_KEY "${HDF5_PACKAGE_NAME}-${HDF5_PACKAGE_VERSION}-${LIB_TYPE}")
SET (CPACK_MONOLITHIC_INSTALL ON)
SET (CPACK_NSIS_CONTACT "${HDF5_PACKAGE_BUGREPORT}")
SET (CPACK_NSIS_MODIFY_PATH ON)
SET (CPACK_NSIS_PACKAGE_NAME "HDF5 ${HDF5_PACKAGE_VERSION}")
+ ELSEIF (APPLE)
+ SET (CPACK_COMPONENTS_ALL_IN_ONE_PACKAGE ON)
+ SET (CPACK_PACKAGE_DEFAULT_LOCATION "/opt/${CPACK_PACKAGE_NAME}")
+ SET (CPACK_PACKAGING_INSTALL_PREFIX "/")
ELSE (WIN32)
SET (CPACK_PACKAGING_INSTALL_PREFIX "/usr")
SET (CPACK_COMPONENTS_ALL_IN_ONE_PACKAGE ON)