From 516df8ab7d16526a9b8b87795e1d4d6613c0b635 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Candice=20Bent=C3=A9jac?= Date: Tue, 6 Feb 2024 17:53:14 +0100 Subject: [PATCH] [build] SwigBinding: Compile on Windows --- src/aliceVision/CMakeLists.txt | 2 ++ src/aliceVision/camera/CMakeLists.txt | 1 + src/aliceVision/geometry/CMakeLists.txt | 1 + src/aliceVision/global.i | 5 ++++- src/aliceVision/hdr/CMakeLists.txt | 1 + src/aliceVision/sensorDB/CMakeLists.txt | 1 + src/aliceVision/sfmData/CMakeLists.txt | 1 + src/aliceVision/sfmDataIO/CMakeLists.txt | 1 + src/aliceVision/stl/CMakeLists.txt | 1 + 9 files changed, 13 insertions(+), 1 deletion(-) diff --git a/src/aliceVision/CMakeLists.txt b/src/aliceVision/CMakeLists.txt index 9e5dd9a62c..db862d768a 100644 --- a/src/aliceVision/CMakeLists.txt +++ b/src/aliceVision/CMakeLists.txt @@ -117,10 +117,12 @@ if(ALICEVISION_BUILD_SWIG_BINDING) target_link_libraries(pyalicevision PUBLIC aliceVision_numeric + ${Python3_LIBRARIES} ) install( TARGETS pyalicevision + DESTINATION ${CMAKE_INSTALL_PREFIX} ) diff --git a/src/aliceVision/camera/CMakeLists.txt b/src/aliceVision/camera/CMakeLists.txt index b0490fa027..5c20899342 100644 --- a/src/aliceVision/camera/CMakeLists.txt +++ b/src/aliceVision/camera/CMakeLists.txt @@ -93,6 +93,7 @@ if (ALICEVISION_BUILD_SWIG_BINDING) target_link_libraries(camera PUBLIC aliceVision_camera + ${Python3_LIBRARIES} ) install( diff --git a/src/aliceVision/geometry/CMakeLists.txt b/src/aliceVision/geometry/CMakeLists.txt index 5fa8ceb563..94b6391daf 100644 --- a/src/aliceVision/geometry/CMakeLists.txt +++ b/src/aliceVision/geometry/CMakeLists.txt @@ -72,6 +72,7 @@ if (ALICEVISION_BUILD_SWIG_BINDING) target_link_libraries(geometry PUBLIC aliceVision_geometry + ${Python3_LIBRARIES} ) install( diff --git a/src/aliceVision/global.i b/src/aliceVision/global.i index 31d3cf37f0..b0e41fa437 100644 --- a/src/aliceVision/global.i +++ b/src/aliceVision/global.i @@ -37,7 +37,10 @@ %template(IndexTSet) std::set; -%template(SizeTPair) std::pair; +namespace std { + %template(SizeTPair) pair; +} +%template(LongUintPair) std::pair; // As defined in aliceVision/types.hpp %template(Pair) std::pair; diff --git a/src/aliceVision/hdr/CMakeLists.txt b/src/aliceVision/hdr/CMakeLists.txt index c97d80a0ab..4870e32444 100644 --- a/src/aliceVision/hdr/CMakeLists.txt +++ b/src/aliceVision/hdr/CMakeLists.txt @@ -89,6 +89,7 @@ if (ALICEVISION_BUILD_SWIG_BINDING) aliceVision_numeric aliceVision_image aliceVision_sfmData + ${Python3_LIBRARIES} ) install( diff --git a/src/aliceVision/sensorDB/CMakeLists.txt b/src/aliceVision/sensorDB/CMakeLists.txt index 07318334c8..6bc4906a39 100644 --- a/src/aliceVision/sensorDB/CMakeLists.txt +++ b/src/aliceVision/sensorDB/CMakeLists.txt @@ -63,6 +63,7 @@ if (ALICEVISION_BUILD_SWIG_BINDING) target_link_libraries(sensorDB PUBLIC aliceVision_sensorDB + ${Python3_LIBRARIES} ) install( diff --git a/src/aliceVision/sfmData/CMakeLists.txt b/src/aliceVision/sfmData/CMakeLists.txt index 8815dad4cf..96eef53c44 100644 --- a/src/aliceVision/sfmData/CMakeLists.txt +++ b/src/aliceVision/sfmData/CMakeLists.txt @@ -88,6 +88,7 @@ if (ALICEVISION_BUILD_SWIG_BINDING) PUBLIC aliceVision_sfmData aliceVision_camera + ${Python3_LIBRARIES} ) install( diff --git a/src/aliceVision/sfmDataIO/CMakeLists.txt b/src/aliceVision/sfmDataIO/CMakeLists.txt index 7c762ab104..e6c993c502 100644 --- a/src/aliceVision/sfmDataIO/CMakeLists.txt +++ b/src/aliceVision/sfmDataIO/CMakeLists.txt @@ -132,6 +132,7 @@ if (ALICEVISION_BUILD_SWIG_BINDING) target_link_libraries(sfmDataIO PUBLIC aliceVision_sfmDataIO + ${Python3_LIBRARIES} ) install( diff --git a/src/aliceVision/stl/CMakeLists.txt b/src/aliceVision/stl/CMakeLists.txt index 2f21820973..4d8278fdc4 100644 --- a/src/aliceVision/stl/CMakeLists.txt +++ b/src/aliceVision/stl/CMakeLists.txt @@ -55,6 +55,7 @@ if (ALICEVISION_BUILD_SWIG_BINDING) aliceVision_stl aliceVision_system Boost::container + ${Python3_LIBRARIES} ) install(