Skip to content

Commit 4d53af1

Browse files
[CMake] Fix TinyXML2 cmake module for windeppack (sofa-framework#6015)
* fix TinyXML2 cmake module for windeppack * dummy for launching Pixi CI
1 parent 3e44b8d commit 4d53af1

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

cmake/Modules/FindTinyXML2.cmake

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,12 @@ else()
2727
endif()
2828

2929
if(WIN32)
30-
# possibly also add lib/{win32,win64} to path_suffixes for compat with the windeppack
30+
# when using WinDepPack, dll are located alongside lib files (in lib/{win32,win64}),
31+
# which have been set in CMAKE_LIBRARY_PATH
3132
find_file(TinyXML2_DLL
3233
NAMES tinyxml2.dll
3334
PATH_SUFFIXES bin
35+
PATHS ${CMAKE_LIBRARY_PATH}
3436
)
3537
endif()
3638

pixi.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -359,3 +359,4 @@ full-dev = { features = [
359359
"presets-defaultGUI",
360360
"qt-gui",
361361
"python-supported"]}
362+

0 commit comments

Comments
 (0)