[Bf-blender-cvs] [dde810c] master: Revert "Fix: T46526, Do not try to install sqlite3.dll anymore as we link it statically into pythons _sqlite"

Martijn Berger noreply at git.blender.org
Thu Feb 18 10:54:04 CET 2016


Commit: dde810c268f9dcdcb94fef91e52a8c08a976d944
Author: Martijn Berger
Date:   Thu Feb 18 10:52:36 2016 +0100
Branches: master
https://developer.blender.org/rBdde810c268f9dcdcb94fef91e52a8c08a976d944

Revert "Fix: T46526, Do not try to install sqlite3.dll anymore as we link it statically into pythons _sqlite"

This reverts commit a8e6b633c9f54f0948a0b9a47534bc38ac95889f.

===================================================================

M	source/creator/CMakeLists.txt

===================================================================

diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
index 2710cff..aa4b0c3 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.




More information about the Bf-blender-cvs mailing list