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

[Peter Kümmel]

SVN commit 1229656 by kuemmel:

cmake: add option for kst version

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


--- branches/work/kst/portto4/kst/cmake/CMakeLists.txt #1229655:1229656
@@ -8,16 +8,11 @@
 get_filename_component(kst_dir ${CMAKE_SOURCE_DIR}/.. ABSOLUTE)
 get_filename_component(kst_build_dir ${CMAKE_BINARY_DIR}/build ABSOLUTE)
 
-
-set(kst_version_major 2)
-set(kst_version_minor 0)
-set(kst_version_patch 3)
-set(kst_version ${kst_version_major}.${kst_version_minor}.${kst_version_patch})
-
 set(kst_binary_name kst2)
 
 
 kst_option_init()
+kst_option(version_string "Version string" OFF all)
 kst_option(release "Build release version: optimize for speed, don't embedded debug symbols" OFF all)
 kst_option(merge_files "Merge files to speedup build about factor 5" OFF all)
 kst_option(merge_rebuild "Rebuild generated files from merged files build" OFF all)
@@ -37,6 +32,16 @@
 message(STATUS)
 
 
+set(kst_version_major 2)
+if(kst_version_string)
+	set(kst_version ${kst_version_string})
+else()
+	set(kst_version_minor 0)
+	set(kst_version_patch 3)
+	set(kst_version ${kst_version_major}.${kst_version_minor}.${kst_version_patch})
+endif()
+
+
 if(kst_3rdparty_download)
 	message(STATUS "Checking downloaded 3rd party binaries.")
 	set(_deps kst-3rdparty-win32-deps)
--- branches/work/kst/portto4/kst/misc/mingw-release-download-deps.bat #1229655:1229656
@@ -1,5 +1,5 @@
 
-cmake ..\kst\cmake -G"MinGW Makefiles" -Dkst_release=1 -Dkst_merge_files=1 -Dkst_3rdparty_download=1 -Dkst_install_prefix=%1
+cmake ..\kst\cmake -G"MinGW Makefiles" -Dkst_release=1 -Dkst_merge_files=1 -Dkst_3rdparty_download=1 -Dkst_install_prefix=Kst-%1 -Dkst_version_string=%1
 
 mingw32-make
 mingw32-make install