Update CMakeLists.txt and pyproject.toml for Windows architecture handling and installation path adjustments

Author: urban233

.github/workflows/wheels.yaml

@@ -65,7 +65,7 @@ jobs:
         run: |
           ${{ env.VCPKG_ROOT }}/vcpkg install --triplet=x86-windows-static
           call .venv\Scripts\activate.bat
-          set WIN_ARCH='x86'
+          set WIN_ARCH=x86
           cibuildwheel . --platform windows --archs x86
         shell: cmd
 
@@ -74,7 +74,7 @@ jobs:
         run: |
           ${{ env.VCPKG_ROOT }}/vcpkg install --triplet=x64-windows-static
           call .venv\Scripts\activate.bat
-          set WIN_ARCH='x64'
+          set WIN_ARCH=x64
           cibuildwheel . --platform windows --archs AMD64
         shell: cmd
 

CMakeLists.txt

@@ -11,6 +11,7 @@ set(CMAKE_VERBOSE_MAKEFILE on)
 # If CLion is used for the build process, be sure to add the argument to
 # the "CMake profile" under "CMake options".
 if(WIN32)
+    message("Running on Windows.")
     set(PLATFORM WINDOWS)
     # The vcpkg target triplet has to be set BEFORE the project() function
     # of CMake!
@@ -20,8 +21,10 @@ if(WIN32)
         # accordingly.
         if($ENV{WIN_ARCH} STREQUAL "x86")
             set(VCPKG_TARGET_TRIPLET x86-windows-static)
+            set(ARCH_SPECIFIC_LIB_DIR ${CMAKE_SOURCE_DIR}/pre-built/windows/libx86)
         elseif($ENV{WIN_ARCH} STREQUAL "x64")
             set(VCPKG_TARGET_TRIPLET x64-windows-static)
+            set(ARCH_SPECIFIC_LIB_DIR ${CMAKE_SOURCE_DIR}/pre-built/windows/libx64)
         endif()
     else()
         message(FATAL_ERROR "WIN_ARCH environment variable is not defined")
@@ -59,7 +62,7 @@ if (${PLATFORM} STREQUAL "WINDOWS")
 
     set(LIB_DIR
             ${CMAKE_SOURCE_DIR}/vcpkg_installed/${VCPKG_TARGET_TRIPLET}/lib
-            ${CMAKE_SOURCE_DIR}/pre-built/windows/libx64
+            ${ARCH_SPECIFIC_LIB_DIR}
     )
     set(ALL_COMPILER_ARGS
             /MP
@@ -422,7 +425,6 @@ target_include_directories(_cmd PUBLIC ${ALL_INCLUDE_DIR})
 # ----- Packages section
 # The variable for the Python target is needed, otherwise CLion
 # does not recognize the build target as valid target and therefore CMake fails.
-set(PY_LIB )
 find_package(freetype CONFIG REQUIRED)
 find_package(glew CONFIG REQUIRED)
 find_package(PNG CONFIG REQUIRED)

pre-built/windows/libx64/AdvAPI32.Lib

@@ -46,7 +46,7 @@ build.verbose = true
 logging.level = "DEBUG"
 cmake.args = [
   "-DCMAKE_TOOLCHAIN_FILE=./vendor/vcpkg/scripts/buildsystems/vcpkg.cmake",
-  "-DVCPKG_INSTALLED_DIR=./vcpkg_installed",
+  "-DVCPKG_INSTALLED_DIR=./cmake-build-release",
   "-DBUILD_PYTHON_EXTENSION=ON"
 ]
 sdist.include = [
@@ -80,10 +80,10 @@ before-all = "yum install -y perl perl-IPC-Cmd zip"
 #manylinux-x86_64-image = "manylinux2014"
 manylinux-x86_64-image = "manylinux_2_28"
 
-[tool.cibuildwheel.windows]
-repair-wheel-command = """\
-    delvewheel repair \
-        -v \
-        --wheel-dir={dest_dir} \
-        {wheel} \
-"""
+#[tool.cibuildwheel.windows]
+#repair-wheel-command = """\
+#    delvewheel repair \
+#        -v \
+#        --wheel-dir={dest_dir} \
+#        {wheel} \
+#"""