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

Peter Kümmel syntheticpp at gmx.net
Wed Feb 2 16:49:48 CET 2011


SVN commit 1218497 by kuemmel:

release with cmake

 M  +7 -0      cmake/CMakeLists.txt  
 M  +3 -2      cmake/modules/KstMacros.cmake  
 M  +3 -2      misc/mingw-release-download-deps.bat  


--- branches/work/kst/portto4/kst/cmake/CMakeLists.txt #1218496:1218497
@@ -194,6 +194,11 @@
 #
 # http://cmake.org/cmake/help/cmake-2-8-docs.html#module:CPack
 
+if(WIN32)
+	set(CPACK_GENERATOR NSIS ZIP)
+	set(CPACK_BINARY_ZIP 1)
+endif()
+
 set(CPACK_PACKAGE_NAME   Kst)
 set(CPACK_PACKAGE_VENDOR "The Kst Team")
 set(CPACK_PACKAGE_VERSION_MAJOR ${kst_version_major})
@@ -204,7 +209,9 @@
 set(CPACK_PACKAGE_DESCRIPTION_FILE    ${kst_dir}/README)
 set(CPACK_PACKAGE_CONTACT "http://bugs.kde.org}")
 set(CPACK_PACKAGE_INSTALL_DIRECTORY "Kst ${kst_version}")
+set(CPACK_STRIP_FILES 1)
 
+
 set(CPACK_RESOURCE_FILE_LICENSE       ${kst_dir}/COPYING)
 
 
--- branches/work/kst/portto4/kst/cmake/modules/KstMacros.cmake #1218496:1218497
@@ -122,8 +122,9 @@
 	kst_flat_source_group(${kst_${kst_name}_headers} ${kst_${kst_name}_sources_not_generated})
 	kst_revision_add_dependency()
 	if(WIN32)
-		install(TARGETS ${kst_name} RUNTIME DESTINATION bin
-		                            ARCHIVE DESTINATION lib)
+		if(NOT ${type} STREQUAL "STATIC")
+			install(TARGETS ${kst_name} RUNTIME DESTINATION bin)
+		endif()
 	else()
 		install(TARGETS ${kst_name} DESTINATION lib)
 	endif()
--- branches/work/kst/portto4/kst/misc/mingw-release-download-deps.bat #1218496:1218497
@@ -1,5 +1,6 @@
 
-cmake ..\kst\cmake -G"MinGW Makefiles" -Dkst_release=1 -Dkst_merge_files=1 -Dkst_3rdparty_download=1
+cmake ..\kst\cmake -G"MinGW Makefiles" -Dkst_release=1 -Dkst_merge_files=1 -Dkst_3rdparty_download=1 -Dkst_install_prefix=Kst-2.0.3-beta1
 
 mingw32-make
-mingw32-make install/strip
+mingw32-make package
+


More information about the Kst mailing list