[svn-r28152] Correct define vs variable usage

Add VS2015

2 files changed, 31 insertions, 12 deletions

diff --git a/MANIFEST b/MANIFEST
index 74439a0..8d0a082 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -32,7 +32,7 @@
 ./README.txt
 ./BRANCH.txt
 ./acsite.m4
-./autogen.sh         
+./autogen.sh
 ./configure.ac
 
 ./bin/COPYING
@@ -2521,4 +2521,4 @@
 
 # CMake-specific User Scripts
 ./config/cmake/scripts/CTestScript.cmake
-./config/cmake/scripts/HDF518config.cmake
+./config/cmake/scripts/HDF5config.cmake
diff --git a/config/cmake/scripts/HDF518config.cmake b/config/cmake/scripts/HDF5config.cmake
index 7c18e86..8790297 100755
--- a/config/cmake/scripts/HDF518config.cmake
+++ b/config/cmake/scripts/HDF5config.cmake
@@ -11,6 +11,8 @@ cmake_minimum_required(VERSION 3.1.0 FATAL_ERROR)
 # where valid options for OPTION are:

 #     BUILD_GENERATOR - The cmake build generator:

 #            Unix    * Unix Makefiles

+#            VS2015    * Visual Studio 14 2015

+#            VS201564 * Visual Studio 14 2015 Win64

 #            VS2013    * Visual Studio 12 2013

 #            VS201364 * Visual Studio 12 2013 Win64

 #            VS2012    * Visual Studio 11 2012

@@ -23,16 +25,17 @@ cmake_minimum_required(VERSION 3.1.0 FATAL_ERROR)
 #     NO_MAC_FORTRAN  - Yes to be SHARED on a Mac

 ##############################################################################

 

-set(CTEST_SOURCE_VERSION 1.8.16)

-set(CTEST_SOURCE_VERSEXT "-pre1")

+set(CTEST_SOURCE_VERSION 1.9)

+set(CTEST_SOURCE_VERSEXT "")

 

 ##############################################################################

 # handle input parameters to script.

 #BUILD_GENERATOR - which CMake generator to use, required

 #INSTALLDIR - HDF5-1.8 root folder

 #CTEST_BUILD_CONFIGURATION - Release, Debug, RelWithDebInfo

-#CTEST_SOURCE_NAME - name of source folder; HDF5-1.8

-#STATICLIBRARIES - Default is YES

+#CTEST_SOURCE_NAME - name of source folder; HDF5-1.9

+#STATIC_LIBRARIES - Default is YES

+#FORTRAN_LIBRARIES - Default is NO

 #NO_MAC_FORTRAN - set to TRUE to allow shared libs on a Mac

 if(DEFINED CTEST_SCRIPT_ARG)

     # transform ctest script arguments of the form

@@ -52,6 +55,10 @@ if(NOT DEFINED BUILD_GENERATOR)
 else()

   if(${BUILD_GENERATOR} STREQUAL "Unix")

     set(CTEST_CMAKE_GENERATOR "Unix Makefiles")

+  elseif(${BUILD_GENERATOR} STREQUAL "VS2015")

+    set(CTEST_CMAKE_GENERATOR "Visual Studio 14 2015")

+  elseif(${BUILD_GENERATOR} STREQUAL "VS201564")

+    set(CTEST_CMAKE_GENERATOR "Visual Studio 14 2015 Win64")

   elseif(${BUILD_GENERATOR} STREQUAL "VS2013")

     set(CTEST_CMAKE_GENERATOR "Visual Studio 12 2013")

   elseif(${BUILD_GENERATOR} STREQUAL "VS201364")

@@ -78,10 +85,10 @@ endif()
 if(NOT DEFINED CTEST_SOURCE_NAME)

     set(CTEST_SOURCE_NAME "hdf5-${CTEST_SOURCE_VERSION}${CTEST_SOURCE_VERSEXT}")

 endif()

-if(NOT DEFINED STATICLIBRARIES)

+if(NOT DEFINED STATIC_LIBRARIES)

     set(STATICLIBRARIES "YES")

 endif()

-if(NOT DEFINED FORTRANLIBRARIES)

+if(NOT DEFINED FORTRAN_LIBRARIES)

     set(FORTRANLIBRARIES "NO")

 endif()

 

@@ -100,7 +107,15 @@ endif()
 if(WIN32)

   set(SITE_OS_NAME "Windows")

   set(SITE_OS_VERSION "WIN7")

-  if(${BUILD_GENERATOR} STREQUAL "VS201364")

+  if(${BUILD_GENERATOR} STREQUAL "VS201564")

+    set(SITE_OS_BITS "64")

+    set(SITE_COMPILER_NAME "vs2015")

+    set(SITE_COMPILER_VERSION "14")

+  elseif(${BUILD_GENERATOR} STREQUAL "VS2015")

+    set(SITE_OS_BITS "32")

+    set(SITE_COMPILER_NAME "vs2015")

+    set(SITE_COMPILER_VERSION "14")

+  elseif(${BUILD_GENERATOR} STREQUAL "VS201364")

     set(SITE_OS_BITS "64")

     set(SITE_COMPILER_NAME "vs2013")

     set(SITE_COMPILER_VERSION "12")

@@ -146,9 +161,9 @@ set(MODEL "Experimental")
 #set(LOCAL_NO_PACKAGE "TRUE")

 #####       Following controls source update                  #####

 #set(LOCAL_UPDATE "TRUE")

-set(REPOSITORY_URL "http://svn.hdfgroup.uiuc.edu/hdf5/branches/hdf5_1_8_16")

+set(REPOSITORY_URL "http://svn.hdfgroup.uiuc.edu/hdf5/trunk")

 #uncomment to use a compressed source file: *.tar on linux or mac *.zip on windows

-#set(CTEST_USE_TAR_SOURCE "${CTEST_SOURCE_VERSION}${CTEST_SOURCE_VERSEXT}")

+#set(CTEST_USE_TAR_SOURCE "${CTEST_SOURCE_VERSION}")

 ###################################################################

 

 ###################################################################

@@ -180,9 +195,13 @@ set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ALLOW_EXTERNAL_SUPPORT:STRING
 #set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_SZIP_ENCODING:BOOL=OFF")

 ####      fortran       ####

 if(${FORTRANLIBRARIES})

-  set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF_BUILD_FORTRAN:BOOL=ON")

+  set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_FORTRAN:BOOL=ON")

   ### enable Fortran 2003 depends on HDF5_BUILD_FORTRAN

   set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_F2003:BOOL=ON")

+else()

+  set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_FORTRAN:BOOL=OFF")

+  ### enable Fortran 2003 depends on HDF5_BUILD_FORTRAN

+  set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_F2003:BOOL=OFF")

 endif()

 

 ### disable test program builds