diff options
| author | Martijn Berger <martijn.berger@gmail.com> | 2016-02-18 12:52:36 +0300 |
|---|---|---|
| committer | Martijn Berger <martijn.berger@gmail.com> | 2016-02-18 12:53:54 +0300 |
| commit | dde810c268f9dcdcb94fef91e52a8c08a976d944 (patch) | |
| tree | eee8876ed3031c3cfb7ecf210fc01245b80ef33c /source/creator | |
| parent | e1f624ecefb1caef07ab24e8362a42445a16b2a7 (diff) | |
Revert "Fix: T46526, Do not try to install sqlite3.dll anymore as we link it statically into pythons _sqlite"
This reverts commit a8e6b633c9f54f0948a0b9a47534bc38ac95889f.
Diffstat (limited to 'source/creator')
| -rw-r--r-- | source/creator/CMakeLists.txt | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt index 2710cffd2d3..aa4b0c37efd 100644 --- a/source/creator/CMakeLists.txt +++ b/source/creator/CMakeLists.txt @@ -621,6 +621,21 @@ elseif(WIN32) if(WITH_PYTHON) string(REPLACE "." "" _PYTHON_VERSION_NO_DOTS ${PYTHON_VERSION}) + # MinGW TODO: This bit of Python configuration diverges from MSVC + if(NOT CMAKE_COMPILER_IS_GNUCC) + install( + FILES ${LIBDIR}/python/lib/python${_PYTHON_VERSION_NO_DOTS}.dll ${LIBDIR}/python/lib/sqlite3.dll + DESTINATION "." + CONFIGURATIONS Release;RelWithDebInfo;MinSizeRel + ) + + install( + FILES ${LIBDIR}/python/lib/python${_PYTHON_VERSION_NO_DOTS}_d.dll ${LIBDIR}/python/lib/sqlite3_d.dll + DESTINATION "." + CONFIGURATIONS Debug + ) + endif() + if(WITH_PYTHON_INSTALL) # note, as far as python is concerned 'RelWithDebInfo' is not debug since its without debug flags. |