[svn-r25267] update external lib option property

4 files changed, 11 insertions, 8 deletions

diff --git a/CMakeFilters.cmake b/CMakeFilters.cmake
index 541c1d4..f52b99b 100644
--- a/CMakeFilters.cmake
+++ b/CMakeFilters.cmake
@@ -17,7 +17,9 @@ HDF5_SETUP_FILTERS (NBIT)
 HDF5_SETUP_FILTERS (SCALEOFFSET)
 
 include (ExternalProject)
-option (HDF5_ALLOW_EXTERNAL_SUPPORT "Allow External Library Building (NO SVN TGZ)" "NO")
+#option (HDF5_ALLOW_EXTERNAL_SUPPORT "Allow External Library Building (NO SVN TGZ)" "NO")
+set (HDF5_ALLOW_EXTERNAL_SUPPORT "NO" CACHE STRING "Allow External Library Building (NO SVN TGZ)")
+set_property (CACHE HDF5_ALLOW_EXTERNAL_SUPPORT PROPERTY STRINGS NO SVN TGZ)
 if (HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "SVN" OR HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "TGZ")
   option (ZLIB_USE_EXTERNAL "Use External Library Building for ZLIB" 1)
   option (SZIP_USE_EXTERNAL "Use External Library Building for SZIP" 1)
diff --git a/release_docs/INSTALL_CMake.txt b/release_docs/INSTALL_CMake.txt
index 36e8380..40f8023 100644
--- a/release_docs/INSTALL_CMake.txt
+++ b/release_docs/INSTALL_CMake.txt
@@ -402,7 +402,8 @@ These five steps are described in detail below.
                 set (HDF5_ENABLE_THREADSAFE OFF CACHE BOOL "(WINDOWS)Enable Threadsafety" FORCE)
                 set (HDF5_PACKAGE_EXTLIBS OFF CACHE BOOL "(WINDOWS)CPACK - include external libraries" FORCE)
                 set (HDF5_NO_PACKAGES OFF CACHE BOOL "CPACK - Disable packaging" FORCE)
-                set (HDF5_ALLOW_EXTERNAL_SUPPORT "NO" CACHE STRING "Allow External Library Building" FORCE)
+                set (HDF5_ALLOW_EXTERNAL_SUPPORT "NO" CACHE STRING "Allow External Library Building (NO SVN TGZ)" FORCE)
+                set_property (CACHE HDF5_ALLOW_EXTERNAL_SUPPORT PROPERTY STRINGS NO SVN TGZ)
                 set (ZLIB_SVN_URL "http://svn.hdfgroup.uiuc.edu/zlib/trunk" CACHE STRING "Use ZLib from HDF repository" FORCE)
                 set (SZIP_SVN_URL "http://svn.hdfgroup.uiuc.edu/szip/trunk" CACHE STRING "Use SZip from HDF repository" FORCE)
                 set (ZLIB_TGZ_NAME "ZLib.tar.gz" CACHE STRING "Use ZLib from compressed file" FORCE)
@@ -640,7 +641,7 @@ cmake_minimum_required(VERSION 2.8.10 FATAL_ERROR)
 set(CTEST_SOURCE_NAME hdf5-1.8.13)
 # this is the location of the source with ctest parameter hdf5src
 # "ctest -S HDF518LinuxCmake.cmake,hdf5src -C Release -O hdf518static.log"
-set(CTEST_SOURCE_NAME ${CTEST_SCRIPT_ARG})
+#set(CTEST_SOURCE_NAME ${CTEST_SCRIPT_ARG})
 
 # this is the location of the build directory
 set(CTEST_BINARY_NAME ${CTEST_SOURCE_NAME}/build)
diff --git a/release_docs/USING_HDF5_CMake.txt b/release_docs/USING_HDF5_CMake.txt
index 8d09b22..7f99028 100644
--- a/release_docs/USING_HDF5_CMake.txt
+++ b/release_docs/USING_HDF5_CMake.txt
@@ -27,7 +27,7 @@ Notes: This short instruction is written for users who want to quickly
             
          3. See the appendix at the bottom of this file for an example 
             of using a ctest script for building and testing. See 
-            CMake.txt for more information.
+            INSTALL_CMake.txt for more information.
 
 
 
@@ -69,7 +69,7 @@ Go through these steps to build HDF5 applications with CMake.
    1. Run CMake
    2. Configure the cache settings
    3. Build HDF5 Applications
-   4. Test HDF5 Applications.
+   4. Test HDF5 Applications
 
 These steps are described in more detail below.
 
diff --git a/release_docs/USING_HDF5_VS.txt b/release_docs/USING_HDF5_VS.txt
index 9bf301e..9063ea6 100644
--- a/release_docs/USING_HDF5_VS.txt
+++ b/release_docs/USING_HDF5_VS.txt
@@ -18,12 +18,12 @@ Using Visual Studio 2010 with HDF5 Libraries built with Visual Studio 2010
 
    1. Set up path for external libraries and headers
 
-      The path settings will need to be in project property sheets per project. 
+      The path settings will need to be in the project property sheets per project. 
       Go to "Project" and select "Properties", find "Configuration Properties", 
       and then "VC++ Directories".
           
       1.1 If you are building on 64-bit Windows, find the "Platform" dropdown
-              and select "x64".
+          and select "x64".
               
       1.2 Add the header path to the "Include Directories" setting.
           
@@ -42,7 +42,7 @@ Using Visual Studio 2010 with HDF5 Libraries built with Visual Studio 2010
 Using Visual Studio 2008 with HDF5 Libraries built with Visual Studio 2008
 ==========================================================================
 
-   2. Set up path for external libraries and headers
+   2. Set up the path for external libraries and headers
 
       Invoke Microsoft Visual Studio and go to "Tools" and select "Options", 
       find "Projects", and then "VC++ Directories".