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

[Peter Kümmel]

SVN commit 1304205 by kuemmel:

update to getdata 0.8.0

build system fixes

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


--- branches/work/kst/portto4/kst/cmake/3rdparty/CMakeLists.txt #1304204:1304205
@@ -38,7 +38,7 @@
 # GETDATA
 set(ext_src ${build_dir}/getdata/src/getdata)
 if(WIN32)
-	set(ext_url http://sourceforge.net/projects/kst/files/3rdparty/getdata_win-0.7.3-mingw-fixed.zip)
+	set(ext_url http://sourceforge.net/projects/getdata/files/getdata/0.8.0/getdata_win-0.8.0.zip)
 	set(ext_configure cmake ${ext_src}/cmake ${generator} ${rc_compiler} ${install_prefix} ${build_type})
 	set(ext_install ${install_target})
 	set(ext_make ${CMAKE_MAKE_PROGRAM})
--- branches/work/kst/portto4/kst/cmake/CMakeLists.txt #1304204:1304205
@@ -75,12 +75,15 @@
 	add_subdirectory(3rdparty)
 elseif(kst_3rdparty_download)
 	if(MINGW)
-		if(GCC_VERSION VERSION_LESS 4.6)
+		if(GCC_VERSION VERSION_EQUAL 4.7 OR GCC_VERSION VERSION_GREATER 4.7)
+			set(ver 4.7)
+			set(md5 554986495f67b9aa1431a59da1677e29)
+		else(GCC_VERSION VERSION_EQUAL 4.6 OR GCC_VERSION VERSION_GREATER 4.6)
+			set(ver 4.6)
+			set(md5 70d8670af9c21eb8fb466654c95d8e4d)
+		else(GCC_VERSION VERSION_GREATER 4.4)
 			set(ver 4.4)
 			set(md5 999248fb40a44543af4dd4cd1be0ceeb)
-		else(GCC_VERSION VERSION_GREATER 4.6)
-			set(ver 4.6)
-			set(md5 70d8670af9c21eb8fb466654c95d8e4d)
 		else()
 			message(FATA_ERROR "MinGW version ${GCC_VERSION} not supported")
 		endif()
--- branches/work/kst/portto4/kst/cmake/misc/CMakeLists.txt #1304204:1304205
@@ -23,10 +23,12 @@
 
 if(MINGW)
 	get_filename_component(MINGW_BIN_PATH ${CMAKE_CXX_COMPILER} PATH)
-	if(GCC_VERSION VERSION_LESS 4.7)
+	if(GCC_VERSION VERSION_EQUAL 4.7 OR GCC_VERSION VERSION_GREATER 4.7)
 		set(runtime ${MINGW_BIN_PATH}/libgcc_s_dw2-1.dll ${MINGW_BIN_PATH}/mingwm10.dll)
+	else(GCC_VERSION VERSION_EQUAL 4.6 OR GCC_VERSION VERSION_GREATER 4.6)
+		set(runtime ${MINGW_BIN_PATH}/libgcc_s_sjlj-1.dll ${MINGW_BIN_PATH}/libwinpthread-1.dll)
 	else()
-		set(runtime ${MINGW_BIN_PATH}/libgcc_s_sjlj-1.dll ${MINGW_BIN_PATH}/libwinpthread-1.dll)
+		message(FATA_ERROR "MinGW version ${GCC_VERSION} not supported")
 	endif()
 	install(FILES ${runtime} ${MINGW_BIN_PATH}/libstdc++-6.dll DESTINATION bin)
 endif()
--- branches/work/kst/portto4/kst/misc/mingw-release-build-deps.bat #1304204:1304205
@@ -5,7 +5,7 @@
 
 cmake ..\kst\cmake -G"CodeBlocks - MinGW Makefiles" -Dkst_release=1 -Dkst_merge_files=1 -Dkst_3rdparty_build=1 -Dkst_install_prefix=Kst-%1 -Dkst_version_string=%1
 
-mingw32-make -j
+mingw32-make 
 mingw32-make install/strip
 mingw32-make package
 mingw32-make package_source
--- branches/work/kst/portto4/kst/misc/mingw-release-download-deps.bat #1304204:1304205
@@ -3,12 +3,13 @@
 mkdir      mingw-release-download-deps
 cd         mingw-release-download-deps
 
-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
+::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
+cmake ..\kst\cmake -GNinja -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/strip
-mingw32-make package
-mingw32-make package_source
+ninja 
+ninja install/strip
+ninja package
+ninja package_source
 
 cd ..