Merge pull request #10454 from jmarrec/develop

Fix #10453 - python38.dll missing on windows installers

.github/workflows/windows_release.yml

@@ -102,6 +102,15 @@ jobs:
         mpm --find-updates
         mpm --admin --find-updates
 
+    - name: Downgrade cmake to 3.28
+      run: |
+        cmake --version
+        choco install cmake --version=3.28.4 --installargs 'ADD_CMAKE_TO_PATH=System'
+
+    - name: Check cmake
+      run: |
+        cmake --version
+
     # This will install all required packages and does that in a single thread. So later in cmake we can safely run in parallel
     - name: Install required packages by building the Test document
       shell: bash

cmake/PythonGetLibAndLinkUp.cmake

@@ -25,4 +25,5 @@ if(WIN32)
 endif()
 
 # then copy the DLL in
+message("COPYING ${RESOLVED_PYTHON_LIB} to ${BASE_PATH}")
 execute_process(COMMAND "${CMAKE_COMMAND}" -E copy "${RESOLVED_PYTHON_LIB}" "${BASE_PATH}")

src/EnergyPlus/CMakeLists.txt

@@ -913,6 +913,8 @@ endif()
 if(LINK_WITH_PYTHON)
   # link the executable to the dll and bring it in
   get_filename_component(RESOLVED_PYTHON_LIBRARY "${Python_LIBRARIES}" REALPATH)
+  message("Python_LIBRARIES=${Python_LIBRARIES}")
+  message("RESOLVED_PYTHON_LIBRARY=${RESOLVED_PYTHON_LIBRARY}")
   if(WIN32)
 
     # In case you have both release and debug Python libraries on your system, Python_LIBRARIES might be "optimized;C:/.../python38.lib;debug;C:/.../python38_d.lib"
@@ -931,6 +933,7 @@ if(LINK_WITH_PYTHON)
       endforeach()
     # else()
       # No-op, already done above
+      message("RESOLVED_PYTHON_LIBRARY (optimized) =${RESOLVED_PYTHON_LIBRARY}")
     endif()
 
     # Windows is being ugly and linking against the Python DLL but not running
@@ -941,6 +944,7 @@ if(LINK_WITH_PYTHON)
       COMMAND ${CMAKE_COMMAND} -DRESOLVED_PYTHON_LIB=${RESOLVED_PYTHON_LIBRARY} -DEXECUTABLE_PATH=$<TARGET_FILE:energyplusapi> -P
               ${PROJECT_SOURCE_DIR}/cmake/PythonGetLibAndLinkUp.cmake)
   endif()
+
   install(
     CODE "execute_process(
       COMMAND ${CMAKE_COMMAND}