diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2011-10-17 19:55:57 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2011-10-17 19:55:57 (GMT) |
| commit | 299fadaefd7852d2e849be8cef62f0987d53bf20 (patch) | |
| tree | 279e88b804b5382a3e788ecd01f10cf200da0b72 | |
| parent | 0bab223bcc530a72f533605e03ad803dccbf4e77 (diff) | |
| download | hdf5-299fadaefd7852d2e849be8cef62f0987d53bf20.zip hdf5-299fadaefd7852d2e849be8cef62f0987d53bf20.tar.gz hdf5-299fadaefd7852d2e849be8cef62f0987d53bf20.tar.bz2 | |
[svn-r21594] Add CMake option to disable packaging component: needed to avoid configuration warning when using Visual Studio Express versions on windows.
Tested: Windows
| -rw-r--r-- | CMakeLists.txt | 5 | ||||
| -rw-r--r-- | release_docs/CMake.txt | 4 | ||||
| -rw-r--r-- | release_docs/INSTALL_Windows.txt | 3 |
3 files changed, 10 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index ff63012..cb4450e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -604,6 +604,7 @@ ENDIF (HDF5_ENABLE_SZIP_SUPPORT) OPTION (HDF5_PACKAGE_EXTLIBS "CPACK - include external libraries" OFF) IF (NOT HDF5_EXTERNALLY_CONFIGURED) IF (HDF5_PACKAGE_EXTLIBS) + SET (HDF5_NO_PACKAGES OFF CACHE BOOL "CPACK - Disable packaging" FORCE) IF (HDF5_ENABLE_Z_LIB_SUPPORT AND ZLIB_FOUND) PACKAGE_ZLIB_LIBRARY (${HDF5_ALLOW_EXTERNAL_SUPPORT} ${LIB_TYPE}) ENDIF (HDF5_ENABLE_Z_LIB_SUPPORT AND ZLIB_FOUND) @@ -912,7 +913,7 @@ ENDIF (NOT HDF5_EXTERNALLY_CONFIGURED) #----------------------------------------------------------------------------- # Set the cpack variables #----------------------------------------------------------------------------- -IF (NOT HDF5_EXTERNALLY_CONFIGURED) +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}") @@ -1060,4 +1061,4 @@ IF (NOT HDF5_EXTERNALLY_CONFIGURED) ) ENDIF (HDF5_BUILD_HL_LIB) -ENDIF (NOT HDF5_EXTERNALLY_CONFIGURED) +ENDIF (NOT HDF5_EXTERNALLY_CONFIGURED AND NOT HDF5_NO_PACKAGES) diff --git a/release_docs/CMake.txt b/release_docs/CMake.txt index 29162df..359d645 100644 --- a/release_docs/CMake.txt +++ b/release_docs/CMake.txt @@ -218,6 +218,9 @@ Notes: This short instruction is written for users who want to quickly build NOTE: We have just introduced the packaging capability and it has not been extensively tested. Please send us comments on how it can be improved. See NSIS note 8 of this document. + Also, if you are using a VS Express version or do not want to enable + the packaging components, set HDF5_NO_PACKAGES to ON (on the command + line add -DHDF5_NO_PACKAGES:BOOL=ON) 6. The files that support building HDF5 with CMake are all the files in the config/cmake folder, the CMakeLists.txt files in each source folder, and @@ -283,6 +286,7 @@ OPTION (HDF5_BUILD_EXAMPLES "Build HDF5 Library Examples" OFF) OPTION (HDF5_BUILD_CPP_LIB "Build HDF5 C++ Library" OFF) OPTION (HDF5_BUILD_TOOLS "Build HDF5 Tools" OFF) OPTION (HDF5_BUILD_HL_LIB "Build HIGH Level HDF5 Library" OFF) +OPTION (DHDF5_NO_PACKAGES "Do not include CPack Packaging" OFF) ************************************************************************ diff --git a/release_docs/INSTALL_Windows.txt b/release_docs/INSTALL_Windows.txt index bb4c677..4694611 100644 --- a/release_docs/INSTALL_Windows.txt +++ b/release_docs/INSTALL_Windows.txt @@ -69,6 +69,9 @@ Preconditions: Note: We have attempted to mirror our Autoconf configuration files for maintainence reasons. We will maintain the current VS2008 project files for the 1.8 product. + Also, if you are using a VS Express version or do not want to enable + the packaging components, set HDF5_NO_PACKAGES to ON (on the command + line add -DHDF5_NO_PACKAGES:BOOL=ON) Warning: The instructions in this file are not compatible with CMake. Follow the instructions in CMake.txt, dot not use any files from the WINDOWS subfolder. |