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

[Peter Kümmel]

SVN commit 1214397 by kuemmel:

cmake: 
- kst executable depends on all plugins
- add option to disable building of dataobject plugins, 

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


--- branches/work/kst/portto4/kst/cmake/CMakeLists.txt #1214396:1214397
@@ -13,6 +13,7 @@
 kst_revision_project_name(Revision)
 SubversionHeader(${kst_dir} ${kst_revision_project} ${CMAKE_BINARY_DIR}/svnrevision.h _modified)
 
+set(kst_binary_name kst)
 
 message(STATUS)
 message(STATUS "Build options:")
@@ -25,9 +26,11 @@
 kst_option(install_prefix "Install path for Kst, using a default if not set" OFF all)
 kst_option(console "Open console on Windows" OFF win)
 kst_option(3rdparty "Build plugins depending on 3rd party libraries" ON all)
+kst_option(dataobjects "Build dataobject plugins" ON all)
 kst_option(test "Build unit tests" OFF all)
 
 
+
 message(STATUS)
 
 # Find 3rd party libraries
--- branches/work/kst/portto4/kst/cmake/modules/KstMacros.cmake #1214396:1214397
@@ -129,6 +129,7 @@
 	kst_link(kstcore kstmath kstwidgets)
 	install(TARGETS ${kst_name} LIBRARY DESTINATION plugin)
 	kst_find_install_desktop_file(${kst_plugin_dir}/${folder}/${name})
+	add_dependencies(${kst_binary_name} ${kst_name})
 	if(kst_verbose)
 	  message(STATUS "Building plugin ${kst_name}")
 	endif()
--- branches/work/kst/portto4/kst/cmake/src/CMakeLists.txt #1214396:1214397
@@ -5,7 +5,10 @@
 add_subdirectory(kst)
 
 add_subdirectory(datasources)
+
+if(kst_dataobject)
 add_subdirectory(plugins)
+endif()
 
 add_subdirectory(d2asc)
 #add_subdirectory(d2d)
--- branches/work/kst/portto4/kst/cmake/src/kst/CMakeLists.txt #1214396:1214397
@@ -1,4 +1,4 @@
-kst_init(kst)
+kst_init(${kst_binary_name})
 
 kst_files_ignore(main-vld)