[Kst] branches/work/kst/portto4/kst

[Peter Kümmel]

SVN commit 1295139 by kuemmel:

mingw 4.7 fixes

 M  +5 -2      cmake/CMakeLists.txt  
 M  +6 -5      cmake/misc/CMakeLists.txt  
 M  +1 -1      misc/mingw-release-build-deps.bat  
 M  +1 -1      misc/mingw-release-download-deps.bat  


--- branches/work/kst/portto4/kst/cmake/CMakeLists.txt #1295138:1295139
@@ -57,13 +57,16 @@
 	set(kst_version ${kst_version_major}.${kst_version_minor}.${kst_version_patch})
 endif()
 
+if(MINGW)
+	execute_process(COMMAND ${CMAKE_CXX_COMPILER} -dumpversion OUTPUT_VARIABLE GCC_VERSION)
+	message(STATUS "Using GCC version ${GCC_VERSION}")
+endif()
+
 if(kst_3rdparty_build)
 	set(kst_3rdparty_dir ${CMAKE_BINARY_DIR}/3rdparty/installed)
 	add_subdirectory(3rdparty)
 elseif(kst_3rdparty_download)
     if(MINGW)
-        execute_process(COMMAND ${CMAKE_CXX_COMPILER} -dumpversion OUTPUT_VARIABLE GCC_VERSION)
-        message(STATUS "Using GCC version ${GCC_VERSION}")
         if(GCC_VERSION VERSION_LESS 4.6)
             set(ver 4.4)
             set(md5 999248fb40a44543af4dd4cd1be0ceeb)
--- branches/work/kst/portto4/kst/cmake/misc/CMakeLists.txt #1295138:1295139
@@ -23,12 +23,13 @@
 
 if(MINGW)
 	get_filename_component(MINGW_BIN_PATH ${CMAKE_CXX_COMPILER} PATH)
-	install(FILES 
-		${MINGW_BIN_PATH}/libgcc_s_dw2-1.dll
-        ${MINGW_BIN_PATH}/libstdc++-6.dll
-		${MINGW_BIN_PATH}/mingwm10.dll
-		DESTINATION bin)
+	if(GCC_VERSION VERSION_LESS 4.7)
+		set(runtime ${MINGW_BIN_PATH}/libgcc_s_dw2-1.dll ${MINGW_BIN_PATH}/mingwm10.dll)
+	else()
+		set(runtime ${MINGW_BIN_PATH}/libgcc_s_sjlj-1.dll ${MINGW_BIN_PATH}/libwinpthread-1.dll)
 endif()
+	install(FILES ${runtime} ${MINGW_BIN_PATH}/libstdc++-6.dll DESTINATION bin)
+endif()
 
 
 if(WIN32)
--- branches/work/kst/portto4/kst/misc/mingw-release-build-deps.bat #1295138:1295139
@@ -6,7 +6,7 @@
 cmake ..\kst\cmake -G"CodeBlocks - MinGW Makefiles" -Dkst_release=1 -Dkst_merge_files=0 -Dkst_3rdparty_build=1 -Dkst_install_prefix=Kst-%1 -Dkst_version_string=%1
 
 mingw32-make -j
-mingw32-make install
+mingw32-make install/strip
 mingw32-make package
 mingw32-make package_source
 
--- branches/work/kst/portto4/kst/misc/mingw-release-download-deps.bat #1295138:1295139
@@ -6,7 +6,7 @@
 cmake ..\kst\cmake -G"CodeBlocks - MinGW Makefiles" -Dkst_release=1 -Dkst_merge_files=1 -Dkst_3rdparty_download=1 -Dkst_install_prefix=Kst-%1 -Dkst_version_string=%1
 
 mingw32-make -j
-mingw32-make install
+mingw32-make install/strip
 mingw32-make package
 mingw32-make package_source