From cd38a32601e3aacacd45365f8f129bfe08f08898 Mon Sep 17 00:00:00 2001
From: Allen Byrne <byrn@hdfgroup.org>
Date: Mon, 17 Oct 2011 14:49:06 -0500
Subject: [svn-r21593] Add CMake option to disable packaging component: needed
 to avoid configuration warning when using Visual Studio Express versions on
 windows.

Tested: Bangan
---
 CMakeLists.txt                   | 5 +++--
 release_docs/CMake.txt           | 4 ++++
 release_docs/INSTALL_Windows.txt | 3 +++
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d7209ea..0e45088 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -607,6 +607,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)
@@ -915,7 +916,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}")
@@ -1063,4 +1064,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 c6e90db..be6aaa8 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 243ccba..e7184d4 100644
--- a/release_docs/INSTALL_Windows.txt
+++ b/release_docs/INSTALL_Windows.txt
@@ -68,6 +68,9 @@ Preconditions:
       Note: We have attempted to mirror our Autoconf configuration files for
             maintainence reasons. We are still working to synchronize the
             configuration files.
+            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)
             
    5. Set up a directory structure to unpack the library.  For example:
 
-- 
cgit v0.12