[PATCH 3/4] Try to detect ext_boost dll name for mingw

alvinhochun+krita at gmail.com alvinhochun+krita at gmail.com
Sat Sep 24 19:33:18 UTC 2016


From: Alvin Wong <alvinhochun at gmail.com>

---
 3rdparty/ext_boost/CMakeLists.txt | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/3rdparty/ext_boost/CMakeLists.txt b/3rdparty/ext_boost/CMakeLists.txt
index 7f97c41..0b0d443 100755
--- a/3rdparty/ext_boost/CMakeLists.txt
+++ b/3rdparty/ext_boost/CMakeLists.txt
@@ -48,6 +48,8 @@ if (MSVC)
 		)
 	endif()
 elseif(MINGW)
+   string(REGEX REPLACE "([0-9])\\.([0-9])(\\.[0-9])?" "\\1\\2"
+      KRITA_boost_COMPILER_VERSION ${CMAKE_CXX_COMPILER_VERSION})
    ExternalProject_Add(
        ext_boost
 
@@ -67,7 +69,7 @@ elseif(MINGW)
    ExternalProject_Add_Step(
        ext_boost
        post_install
-       COMMAND ${CMAKE_COMMAND} -E copy ${PREFIX_ext_boost}/lib/libboost_system-mgw51-mt-1_61.dll ${PREFIX_ext_boost}/bin/
+       COMMAND ${CMAKE_COMMAND} -E copy ${PREFIX_ext_boost}/lib/libboost_system-mgw${KRITA_boost_COMPILER_VERSION}-mt-1_61.dll ${PREFIX_ext_boost}/bin/
        DEPENDEES install
    )
 else()
-- 
2.5.0.windows.1



More information about the kimageshop mailing list