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

[Peter Kümmel]

SVN commit 1212886 by kuemmel:

fix pkg name for cfitsio, verbose cmake output only with option kst_verbose

 M  +1 -1      CMakeLists.txt  
 M  +1 -1      modules/FindCFITSIO.cmake  
 M  +2 -3      modules/KstMacros.cmake  
 M  +11 -13    src/datasources/CMakeLists.txt  
 M  +3 -0      src/plugins/CMakeLists.txt  


--- branches/work/kst/portto4/kst/cmake/CMakeLists.txt #1212885:1212886
@@ -14,7 +14,7 @@
 kst_option(release "Build release version" OFF all)
 kst_option(merge_files "Merge files to speedup build" OFF all)
 kst_option(merge_rebuild "Rebuild generated files from merged files build" OFF all)
-kst_option(verbose "Make verbose makefiles" OFF all)
+kst_option(verbose "Make verbose CMake run and Makefiles" OFF all)
 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)
 
--- branches/work/kst/portto4/kst/cmake/modules/FindCFITSIO.cmake #1212885:1212886
@@ -1,7 +1,7 @@
 
 include(FindPkgConfig)
 
-pkg_check_modules(libcfitsio3 libcfitsio3)
+pkg_check_modules(cfitsio cfitsio)
 
 if(CFITSIO_INCLUDEDIR AND CFITSIO_LIBRARIES)
 	set(CFITSIO_LIBRARY -L${CFITSIO_LIBRARY_DIRS} ${CFITSIO_LIBRARIES})
--- branches/work/kst/portto4/kst/cmake/modules/KstMacros.cmake #1212885:1212886
@@ -91,9 +91,8 @@
 	add_library(${kst_name} MODULE ${kst_${kst_name}_sources} ${kst_${kst_name}_headers})
 	kst_link(kstcore kstmath kstwidgets)
 	install(TARGETS ${kst_name} LIBRARY DESTINATION plugin)
-	set(_msg ${ARGV2})
-	if(_msg)
-		message(STATUS "${ARGV2}${kst_name}")
+	if(kst_verbose)
+	  message(STATUS "Building plugin ${kst_name}")
 	endif()
 endmacro()
 
--- branches/work/kst/portto4/kst/cmake/src/datasources/CMakeLists.txt #1212885:1212886
@@ -6,44 +6,42 @@
 	add_definitions(-DKST_USE_KST_ATOF)
 endif()
 
-set(msg "> ")
-message(STATUS "Building datasource plugins---------------------------------")
-kst_add_plugin(. ascii            ${msg})
-kst_add_plugin(. qimagesource     ${msg})
-kst_add_plugin(. sampledatasource ${msg})
 
+
+kst_add_plugin(. ascii)
+kst_add_plugin(. qimagesource)
+kst_add_plugin(. sampledatasource)
+
 if(getdata)
 	include_directories(${GETDATA_INCLUDE_DIR})
-	kst_add_plugin(. dirfilesource ${msg})
+	kst_add_plugin(. dirfilesource)
 	kst_link(${GETDATA_LIBRARIES})
 endif()
 
 if(cfitsio)
 	include_directories(${CFITSIO_INCLUDE_DIR})
-	kst_add_plugin(. fitsimage ${msg})
+	kst_add_plugin(. fitsimage)
 	kst_link(${CFITSIO_LIBRARIES})
 endif()
 
 if(healpix)
-	kst_add_plugin(. healpix ${msg})
+	kst_add_plugin(. healpix)
 endif()
 
 if(lfioo)
-	kst_add_plugin(. lfiio ${msg})
+	kst_add_plugin(. lfiio)
 endif()
 
 if(netcdf)
 	include_directories(${NETCDF_INCLUDE_DIR})
-	kst_add_plugin(. netcdf ${msg})
+	kst_add_plugin(. netcdf)
 	kst_link(${NETCDF_LIBRARIES})
 endif()
 	
 if(planckIDEF)
-	kst_add_plugin(. planckIDEF ${msg})
+	kst_add_plugin(. planckIDEF)
 endif()
 
-
-message(STATUS "------------------------------------------------------------")
 message(STATUS)
 
 
--- branches/work/kst/portto4/kst/cmake/src/plugins/CMakeLists.txt #1212885:1212886
@@ -3,6 +3,7 @@
 kst_init_plugin(src/plugins)
 
 
+
 kst_add_plugin(dataobject bin)
 kst_add_plugin(dataobject chop)
 kst_add_plugin(dataobject linefit)
@@ -63,5 +64,7 @@
 endif()
 
 
+message(STATUS)
 
 
+