Add windows extra options (HDFGroup#4854)

vchoi-hdfgroup · Sep 19, 2024 · 3307ff1 · 3307ff1
1 parent 52d42fd
commit 3307ff1
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
diff --git a/config/cmake/examples/HDF5_Examples.cmake.in b/config/cmake/examples/HDF5_Examples.cmake.in
@@ -42,6 +42,14 @@ if(DEFINED CTEST_SCRIPT_ARG)
   endforeach()
 endif()
 
+if(${CTEST_VSVERS} STREQUAL "64_VS2022") # 64-bit Visual Studio 2022
+  set(CTEST_CMAKE_GENERATOR "Visual Studio 17 2022")
+  set(CMAKE_GENERATOR_ARCHITECTURE "x64")
+elseif(${VS_VERS} STREQUAL "64_VS2019") # 64-bit Visual Studio 2019
+  set(CTEST_CMAKE_GENERATOR "Visual Studio 16 2019")
+  set(CMAKE_GENERATOR_ARCHITECTURE "x64")
+endif()
+
 ###################################################################
 ### Following Line is one of [Release, RelWithDebInfo, Debug] #####
 set(CTEST_CONFIGURATION_TYPE "$ENV{CMAKE_CONFIG_TYPE}")

diff --git a/release_docs/USING_CMake_Examples.txt b/release_docs/USING_CMake_Examples.txt
@@ -56,6 +56,11 @@ Default installation process:
        The default ctest configuration is defined as "Release". It can be changed
            with the CTEST_CONFIGURATION_TYPE script option. Note that this must
            be the same as the value used with the -C command line option.
+           On Windows, you can set the CTEST_VSVERS script option to either
+               64_VS2022 or 64_VS2019. Alternately, you can set the script
+               CTEST_CMAKE_GENERATOR option to "Visual Studio 16 2019" or "Visual Studio 17 2022",
+               and the CMAKE_GENERATOR_ARCHITECTURE script option to "x64".
+
        The default build configuration is defined to build and use static libraries.
 
        Shared libraries and other options can be changed by editing the
@@ -69,15 +74,15 @@ Default installation process:
     When executed, the ctest script will save the results to the log file, test.log, as
     indicated by the ctest command. If you wish to see more build and test information,
     add "-VV" to the ctest command. The output should show;
-          100% tests passed, 0 tests failed out of 156.
+          100% tests passed, 0 tests failed out of 206.
 
 
 ========================================================================
 III. Defaults in the HDF5_Examples_options.cmake file
 ========================================================================
 
-####  DEFAULT:                                                                            ###
-####         BUILD_SHARED_LIBS:BOOL=OFF                                                   ###
+####  DEFAULT:                                                                           ###
+####         BUILD_SHARED_LIBS:BOOL=OFF                                                  ###
 ####         H5EX_BUILD_C:BOOL=ON                                                        ###
 ####         H5EX_BUILD_CXX:BOOL=OFF                                                     ###
 ####         H5EX_BUILD_FORTRAN:BOOL=OFF                                                 ###