Kaynağa Gözat

Merge pull request #15750 from GordonSmith/HPCC-27155-Python3

HPCC-27155 Add Python3 support to vcpkg

Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>
Richard Chapman 3 yıl önce
ebeveyn
işleme
957e1d25e7

+ 1 - 1
cmake_modules/vcpkgSetup.cmake

@@ -8,7 +8,7 @@ set (USE_BOOST_REGEX OFF)
 set (USE_AZURE OFF)
 set (USE_AWS OFF)
 set (WSSQL_SERVICE OFF)
-set (USE_PYTHON3 OFF)
+
 set (USE_CASSANDRA OFF)
 set (USE_JAVA OFF)
 set (USE_NATIVE_LIBRARIES ON)

+ 3 - 3
plugins/py3embed/CMakeLists.txt

@@ -63,13 +63,13 @@ install(
     DESTINATION versioned/python3)
 endif()
 
-target_link_libraries(py3embed ${Python3_LIBRARIES})
-
 target_link_libraries(
     py3embed
     eclrtl
     roxiemem
-    jlib)
+    jlib
+    Python3::Python
+    )
 
 if(PLATFORM OR CLIENTTOOLS_ONLY)
     install(

+ 1 - 0
vcpkg.json

@@ -13,6 +13,7 @@
             "features": []
         },
         "boost-property-tree",
+        "python3",
         "apr",
         "apr-util",
         {