Skip to content

Commit 00a6d59

Browse files
authored
Use exact Python version and fix missing DLLs for plugin. (#141)
1 parent 1010bfd commit 00a6d59

File tree

2 files changed

+20
-4
lines changed

2 files changed

+20
-4
lines changed

CMakeLists.txt

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,27 @@ cmake_policy(SET CMP0144 NEW)
44

55
project(plugin_python CXX)
66

7-
set(Python_FIND_VIRTUALENV STANDARD)
7+
# we need mo2-cmake to obtain the Python version, but mo2-cmake will set
8+
# CMAKE_MAP_IMPORTED_CONFIG_* which will trigger a tons of CMP0111 warnings for Python
9+
# below so we need to reset these before finding Python and then reset them after
10+
find_package(mo2-cmake CONFIG REQUIRED)
11+
12+
set(_CMAKE_MAP_IMPORTED_CONFIG_MINSIZEREL ${CMAKE_MAP_IMPORTED_CONFIG_MINSIZEREL})
13+
set(_CMAKE_MAP_IMPORTED_CONFIG_RELWITHDEBINFO ${CMAKE_MAP_IMPORTED_CONFIG_RELWITHDEBINFO})
14+
set(_CMAKE_MAP_IMPORTED_CONFIG_RELEASE ${CMAKE_MAP_IMPORTED_CONFIG_RELEASE})
15+
16+
set(CMAKE_MAP_IMPORTED_CONFIG_MINSIZEREL "")
17+
set(CMAKE_MAP_IMPORTED_CONFIG_RELWITHDEBINFO "")
18+
set(CMAKE_MAP_IMPORTED_CONFIG_RELEASE "")
819

920
# find Python before include mo2-cmake, otherwise this will trigger a bunch of CMP0111
1021
# due to the imported configuration mapping variables defined in mo2.cmake
11-
find_package(Python ${MO2_PYTHON_VERSION} COMPONENTS Interpreter Development REQUIRED)
22+
find_package(Python ${MO2_PYTHON_VERSION} EXACT COMPONENTS Interpreter Development REQUIRED)
1223
find_package(pybind11 CONFIG REQUIRED)
1324

14-
find_package(mo2-cmake CONFIG REQUIRED)
25+
set(CMAKE_MAP_IMPORTED_CONFIG_MINSIZEREL ${_CMAKE_MAP_IMPORTED_CONFIG_MINSIZEREL})
26+
set(CMAKE_MAP_IMPORTED_CONFIG_RELWITHDEBINFO ${_CMAKE_MAP_IMPORTED_CONFIG_RELWITHDEBINFO})
27+
set(CMAKE_MAP_IMPORTED_CONFIG_RELEASE ${_CMAKE_MAP_IMPORTED_CONFIG_RELEASE})
1528

1629
get_filename_component(Python_HOME ${Python_EXECUTABLE} PATH)
1730
set(Python_DLL_DIR "${Python_HOME}/DLLs")

src/proxy/CMakeLists.txt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,10 @@ mo2_add_translations(proxy
3737
# install DLLs files needed
3838
set(DLL_DIRS ${PLUGIN_PYTHON_DIR}/dlls)
3939
file(GLOB dlls_to_install
40-
# ${PYTHON_BUILD_PATH}/libffi*.dll
40+
${Python_HOME}/dlls/libffi*.dll
41+
${Python_HOME}/dlls/sqlite*.dll
42+
${Python_HOME}/dlls/libssl*.dll
43+
${Python_HOME}/dlls/libcrypto*.dll
4144
${Python_HOME}/python${Python_VERSION_MAJOR}*.dll)
4245
install(FILES ${dlls_to_install} DESTINATION ${DLL_DIRS})
4346

0 commit comments

Comments
 (0)