Skip to content

Commit 4d55c62

Browse files
matlabbematlabbe
committed
fixed qt missing png, fixed opengv not finding eigen with config, fixed python3.dll missing
1 parent fc646eb commit 4d55c62

File tree

5 files changed

+42
-52
lines changed

5 files changed

+42
-52
lines changed

‎app/src/CMakeLists.txt‎

Lines changed: 17 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,21 @@ IF(BUILD_AS_BUNDLE AND (APPLE OR WIN32))
168168
MESSAGE(STATUS "Python3_STDLIB=${SANITIZED_STDLIB}")
169169

170170
install(FILES "${Python3_EXECUTABLE}" DESTINATION bin COMPONENT runtime)
171+
172+
# when using python-opencv, it expects python3.dll, not python312.dll
173+
get_filename_component(VCPKG_TRIPLET_ROOT "${PYTHON_TOOLS_DIR}/../../" ABSOLUTE)
174+
set(VCPKG_BIN_DIR "${VCPKG_TRIPLET_ROOT}/bin")
175+
find_file(PYTHON3_STABLE_DLL
176+
NAMES python3.dll
177+
PATHS "${VCPKG_BIN_DIR}"
178+
NO_DEFAULT_PATH
179+
)
180+
if(PYTHON3_STABLE_DLL)
181+
message(STATUS "Found python3.dll at: ${PYTHON3_STABLE_DLL}")
182+
install(FILES "${PYTHON3_STABLE_DLL}" DESTINATION bin COMPONENT runtime)
183+
endif()
171184

185+
# install python Lib in python312.zip (without site-packages, which is installed separatly afterwards)
172186
file(TO_CMAKE_PATH "${Python3_STDLIB}" SANITIZED_STDLIB)
173187
file(GLOB LIB_CONTENTS RELATIVE "${SANITIZED_STDLIB}" "${SANITIZED_STDLIB}/*")
174188
list(REMOVE_ITEM LIB_CONTENTS "site-packages")
@@ -184,18 +198,16 @@ IF(BUILD_AS_BUNDLE AND (APPLE OR WIN32))
184198
DESTINATION bin/Lib/site-packages
185199
COMPONENT runtime
186200
)
201+
# install python DDLs
187202
install(DIRECTORY "${PYTHON_ROOT}/DLLs"
188203
DESTINATION bin/
189204
COMPONENT runtime
190205
FILES_MATCHING
191206
PATTERN "*.dll"
192207
PATTERN "*.pyd"
193208
)
194-
install(DIRECTORY "${PYTHON_ROOT}/Scripts"
195-
DESTINATION bin/
196-
COMPONENT runtime
197-
)
198-
# install our scripts in share for convenience
209+
210+
# install our python scripts in share for convenience
199211
install(DIRECTORY "${PROJECT_SOURCE_DIR}/corelib/src/python/"
200212
DESTINATION share
201213
COMPONENT runtime
@@ -313,31 +325,5 @@ IF(BUILD_AS_BUNDLE AND (APPLE OR WIN32))
313325
fixup_bundle(\"${APPS}\" \"\${QTPLUGINS}\" \"${DIRS}\")
314326
" COMPONENT runtime)
315327

316-
IF(Python3_FOUND)
317-
IF(WIN32)
318-
# when using python-opencv, it expects python3.dll, not python312.dll
319-
install(CODE "
320-
set(PY_VERSION_SUFFIX \"${Python3_VERSION_MAJOR}${Python3_VERSION_MINOR}\")
321-
set(BIN_DIR \"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/bin\")
322-
set(TARGET_DLL_PATH \"\${BIN_DIR}/python\${PY_VERSION_SUFFIX}.dll\")
323-
set(LINK_DLL_PATH \"\${BIN_DIR}/python3.dll\")
324-
325-
file(TO_NATIVE_PATH \"\${TARGET_DLL_PATH}\" TARGET_DLL)
326-
file(TO_NATIVE_PATH \"\${LINK_DLL_PATH}\" LINK_DLL)
327-
328-
# Use 'mklink /H' to create a hard link on Windows
329-
execute_process(
330-
COMMAND cmd /c mklink /H \"\${LINK_DLL}\" \"\${TARGET_DLL}\"
331-
RESULT_VARIABLE LINK_RESULT
332-
ERROR_VARIABLE LINK_ERROR
333-
)
334-
335-
if(NOT LINK_RESULT EQUAL 0)
336-
message(FATAL_ERROR \"Failed to create python dll hard link: \${LINK_ERROR} (\${LINK_DLL} -> \${TARGET_DLL})\")
337-
endif()
338-
" COMPONENT runtime)
339-
ENDIF()
340-
ENDIF()
341-
342328
ENDIF(BUILD_AS_BUNDLE AND (APPLE OR WIN32))
343329

‎bundle_windows_deps.bat‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ echo [+] Installing dependencies via vcpkg manifest...
4242
--x-feature=openni2 ^
4343
--x-feature=gtsam-deps ^
4444
--x-feature=python ^
45-
--x-feature=libpointmatcher-deps
45+
--x-feature=libpointmatcher-deps || exit /b %errorlevel%
4646

4747
:: 3. Export
4848
echo [+] Exporting built binaries to raw folder...
@@ -51,7 +51,7 @@ for /f "usebackq tokens=*" %%i in (`"%VS_LOCATOR%" -latest -property catalog_pro
5151
set TARGET_NAME=vcpkg-export-%VCPKG_COMMIT_SHORT%-x64-%VS_YEAR%
5252
set TARGET_FULL_PATH=%EXPORT_DIR%\%TARGET_NAME%
5353
if exist "%TARGET_FULL_PATH%" rd /s /q "%TARGET_FULL_PATH%"
54-
"%VCPKG_ROOT%\vcpkg.exe" export --raw --output-dir="%EXPORT_DIR%" --triplet=%TRIPLET%
54+
"%VCPKG_ROOT%\vcpkg.exe" export --raw --output-dir="%EXPORT_DIR%" --triplet=%TRIPLET% || exit /b %errorlevel%
5555

5656
:: Find the actual exported folder name (it usually contains a date/hash)
5757
for /d %%i in ("%EXPORT_DIR%\vcpkg-export-*") do set "FINAL_EXPORT_PATH=%%i"

‎guilib/src/ui/mainWindow.ui‎

Lines changed: 19 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<normaloff>:/images/RTAB-Map.ico</normaloff>:/images/RTAB-Map.ico</iconset>
1919
</property>
2020
<property name="dockOptions">
21-
<set>QMainWindow::AllowNestedDocks|QMainWindow::AllowTabbedDocks|QMainWindow::AnimatedDocks|QMainWindow::VerticalTabs</set>
21+
<set>QMainWindow::DockOption::AllowNestedDocks|QMainWindow::DockOption::AllowTabbedDocks|QMainWindow::DockOption::AnimatedDocks|QMainWindow::DockOption::VerticalTabs</set>
2222
</property>
2323
<widget class="QWidget" name="widget_mainWindow"/>
2424
<widget class="QMenuBar" name="menubar">
@@ -27,7 +27,7 @@
2727
<x>0</x>
2828
<y>0</y>
2929
<width>1012</width>
30-
<height>22</height>
30+
<height>21</height>
3131
</rect>
3232
</property>
3333
<widget class="QMenu" name="menuFile">
@@ -522,15 +522,15 @@
522522
<item>
523523
<layout class="QGridLayout" name="gridLayout" columnstretch="10,0">
524524
<property name="sizeConstraint">
525-
<enum>QLayout::SetMinimumSize</enum>
525+
<enum>QLayout::SizeConstraint::SetMinimumSize</enum>
526526
</property>
527527
<property name="verticalSpacing">
528528
<number>2</number>
529529
</property>
530530
<item row="3" column="1">
531531
<widget class="QDoubleSpinBox" name="doubleSpinBox_stats_timeLimit">
532532
<property name="alignment">
533-
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
533+
<set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
534534
</property>
535535
<property name="suffix">
536536
<string> ms</string>
@@ -562,14 +562,14 @@
562562
<string>Unknown</string>
563563
</property>
564564
<property name="alignment">
565-
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
565+
<set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
566566
</property>
567567
</widget>
568568
</item>
569569
<item row="1" column="1">
570570
<widget class="QDoubleSpinBox" name="doubleSpinBox_stats_imgRate">
571571
<property name="alignment">
572-
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
572+
<set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
573573
</property>
574574
<property name="suffix">
575575
<string> Hz</string>
@@ -604,7 +604,7 @@
604604
<string>Unknown</string>
605605
</property>
606606
<property name="alignment">
607-
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
607+
<set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
608608
</property>
609609
</widget>
610610
</item>
@@ -621,7 +621,7 @@
621621
<string>Unknown</string>
622622
</property>
623623
<property name="alignment">
624-
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
624+
<set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
625625
</property>
626626
</widget>
627627
</item>
@@ -638,7 +638,7 @@
638638
<string>0</string>
639639
</property>
640640
<property name="alignment">
641-
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
641+
<set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
642642
</property>
643643
</widget>
644644
</item>
@@ -656,7 +656,7 @@
656656
<string>0</string>
657657
</property>
658658
<property name="alignment">
659-
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
659+
<set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
660660
</property>
661661
</widget>
662662
</item>
@@ -673,7 +673,7 @@
673673
<string>0</string>
674674
</property>
675675
<property name="alignment">
676-
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
676+
<set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
677677
</property>
678678
</widget>
679679
</item>
@@ -697,7 +697,7 @@
697697
<item row="2" column="1">
698698
<widget class="QDoubleSpinBox" name="doubleSpinBox_stats_detectionRate">
699699
<property name="alignment">
700-
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
700+
<set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
701701
</property>
702702
<property name="suffix">
703703
<string> Hz</string>
@@ -731,7 +731,7 @@
731731
<item>
732732
<spacer name="verticalSpacer_2">
733733
<property name="orientation">
734-
<enum>Qt::Vertical</enum>
734+
<enum>Qt::Orientation::Vertical</enum>
735735
</property>
736736
<property name="sizeHint" stdset="0">
737737
<size>
@@ -956,7 +956,7 @@
956956
</widget>
957957
<widget class="QDockWidget" name="dockWidget_imageView">
958958
<property name="allowedAreas">
959-
<set>Qt::AllDockWidgetAreas</set>
959+
<set>Qt::DockWidgetArea::AllDockWidgetAreas</set>
960960
</property>
961961
<property name="windowTitle">
962962
<string>Loop closure detection</string>
@@ -998,7 +998,7 @@
998998
<string/>
999999
</property>
10001000
<property name="alignment">
1001-
<set>Qt::AlignCenter</set>
1001+
<set>Qt::AlignmentFlag::AlignCenter</set>
10021002
</property>
10031003
</widget>
10041004
</item>
@@ -1024,7 +1024,7 @@
10241024
<string/>
10251025
</property>
10261026
<property name="alignment">
1027-
<set>Qt::AlignCenter</set>
1027+
<set>Qt::AlignmentFlag::AlignCenter</set>
10281028
</property>
10291029
</widget>
10301030
</item>
@@ -1422,6 +1422,9 @@
14221422
</property>
14231423
</action>
14241424
<action name="actionClose_database">
1425+
<property name="enabled">
1426+
<bool>true</bool>
1427+
</property>
14251428
<property name="icon">
14261429
<iconset resource="../GuiLib.qrc">
14271430
<normaloff>:/images/document-save.png</normaloff>:/images/document-save.png</iconset>

‎patches/opengv_91f4b19c.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,13 +49,13 @@ index 9660f55..c4a076f 100644
4949

5050
IF (BUILD_TESTS)
5151
diff --git a/modules/Config.cmake.in b/modules/Config.cmake.in
52-
index 9b4c9ee..485720c 100644
52+
index 9b4c9ee..6963356 100644
5353
--- a/modules/Config.cmake.in
5454
+++ b/modules/Config.cmake.in
5555
@@ -1,4 +1,4 @@
5656
@PACKAGE_INIT@
5757
-
58-
+find_dependency(Eigen3)
58+
+find_dependency(Eigen3 CONFIG)
5959
include("${CMAKE_CURRENT_LIST_DIR}/@targets_export_name@.cmake")
6060
check_required_components("@PROJECT_NAME@")
6161
diff --git a/src/absolute_pose/CentralAbsoluteAdapter.cpp b/src/absolute_pose/CentralAbsoluteAdapter.cpp

‎vcpkg.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,8 @@
9797
"features": [
9898
"gui",
9999
"opengl",
100-
"widgets"
100+
"widgets",
101+
"png"
101102
]
102103
},
103104
{

0 commit comments

Comments
 (0)