set in setup.py

Signed-off-by: inakleinbottle <admin@inakleinbottle.com>
datasig-ac-uk · May 23, 2023 · 9d3d6d0 · 9d3d6d0
1 parent 4774197
commit 9d3d6d0
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/setup.py b/setup.py
@@ -132,17 +132,17 @@
 CMAKE_SETTINGS = [
     "-DLIBALGEBRA_NO_SERIALIZATION:BOOL=ON",
 ]
-if platform.system() == "Windows":
-    vcpkg = Path("build", "vcpkg")
+# if platform.system() == "Windows":
+vcpkg = Path("build", "vcpkg")
+if vcpkg.exists():
+    CMAKE_SETTINGS.append("-DCMAKE_TOOLCHAIN_FILE=%s" % (vcpkg.resolve() / "scripts" / "buildsystems" / "vcpkg.cmake"))
+elif "VCPKG_INSTALLATION_ROOT" in os.environ:
+    vcpkg = Path(os.environ["VCPKG_INSTALLATION_ROOT"])
     if vcpkg.exists():
         CMAKE_SETTINGS.append("-DCMAKE_TOOLCHAIN_FILE=%s" % (vcpkg.resolve() / "scripts" / "buildsystems" / "vcpkg.cmake"))
-    elif "VCPKG_INSTALLATION_ROOT" in os.environ:
-        vcpkg = Path(os.environ["VCPKG_INSTALLATION_ROOT"])
-        if vcpkg.exists():
-            CMAKE_SETTINGS.append("-DCMAKE_TOOLCHAIN_FILE=%s" % (vcpkg.resolve() / "scripts" / "buildsystems" / "vcpkg.cmake"))
 
-    if platform.system() == 'Windows':
-        CMAKE_SETTINGS.append("-DRECOMBINE_INSTALL_DEPENDENTS:BOOL=ON")
+if platform.system() == 'Windows':
+    CMAKE_SETTINGS.append("-DRECOMBINE_INSTALL_DEPENDENTS:BOOL=ON")
 
 
 def filter_cmake_manifests(cmake_manifest):