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

Peter Kümmel syntheticpp at gmx.net
Thu Feb 24 21:40:13 CET 2011


SVN commit 1222553 by kuemmel:

don't install tests

 M  +9 -7      modules/KstMacros.cmake  
 M  +1 -0      src/kst/CMakeLists.txt  


--- branches/work/kst/portto4/kst/cmake/modules/KstMacros.cmake #1222552:1222553
@@ -63,12 +63,7 @@
 endmacro()
 
 
-macro(kst_set_target_properties)
-	set_property(TARGET ${kst_name} PROPERTY DEBUG_POSTFIX ${kst_debug_postfix})
-	set_target_properties(${kst_name} PROPERTIES VERSION ${kst_version} SOVERSION ${kst_version_major})
-endmacro()
 
-
 macro(kst_add_executable)
 	set(CMAKE_RUNTIME_OUTPUT_DIRECTORY  ${kst_build_dir}/bin)
 	include_directories(${kst_${kst_name}_folder} ${CMAKE_CURRENT_BINARY_DIR})
@@ -77,10 +72,16 @@
 	set_property(TARGET ${kst_name} PROPERTY DEBUG_POSTFIX ${kst_debug_postfix})
 	kst_revision_add_dependency()
 	kst_flat_source_group(${kst_${kst_name}_headers} ${kst_${kst_name}_sources_not_generated})
-	install(TARGETS ${kst_name} RUNTIME DESTINATION bin BUNDLE DESTINATION .)
 endmacro()
 
 
+macro(kst_install_executable)
+	install(TARGETS ${kst_name} 
+		RUNTIME DESTINATION bin
+		BUNDLE DESTINATION .)
+endmacro()
+
+
 macro(kst_add_library type)
 	set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${kst_build_dir}/bin)
 	set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${kst_build_dir}/${kst_install_libdir})
@@ -109,7 +110,8 @@
 	else()
 		add_library(${kst_name} ${type} ${kst_${kst_name}_sources} ${kst_${kst_name}_headers} ${svnversion_h})
 	endif()
-	kst_set_target_properties()
+	set_property(TARGET ${kst_name} PROPERTY DEBUG_POSTFIX ${kst_debug_postfix})
+	set_target_properties(${kst_name} PROPERTIES VERSION ${kst_version} SOVERSION ${kst_version_major})
 	kst_flat_source_group(${kst_${kst_name}_headers} ${kst_${kst_name}_sources_not_generated})
 	kst_revision_add_dependency()
 	if(WIN32)
--- branches/work/kst/portto4/kst/cmake/src/kst/CMakeLists.txt #1222552:1222553
@@ -32,6 +32,7 @@
 
 kst_link(kstcore kstmath kstapp kstwidgets)
 
+kst_install_executable()
 
 if(UNIX AND NOT APPLE)
 	


More information about the Kst mailing list