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

[Peter Kümmel]

SVN commit 1286217 by kuemmel:

don't forget found libraries

 M  +3 -2      FindGetdata.cmake  
 M  +5 -2      FindGsl.cmake  
 M  +5 -2      FindMatio.cmake  
 M  +5 -5      FindNetcdf.cmake  


--- branches/work/kst/portto4/kst/cmake/modules/FindGetdata.cmake #1286216:1286217
@@ -43,10 +43,11 @@
 endforeach()
 
 if(GETDATA_LIBRARIES_DEBUG AND GETDATA_LIBRARIES_RELEASE)
-	set(GETDATA_LIBRARIES ${GETDATA_LIBRARIES_BOTH})
+	set(GETDATA_LIBRARIES ${GETDATA_LIBRARIES_BOTH} CACHE STRING "" FORCE)
 else()
-	set(GETDATA_LIBRARIES ${GETDATA_LIBRARIES_RELEASE})
+	set(GETDATA_LIBRARIES ${GETDATA_LIBRARIES_RELEASE} CACHE STRING "" FORCE)
 endif()
+
 endif()
 
 
--- branches/work/kst/portto4/kst/cmake/modules/FindGsl.cmake #1286216:1286217
@@ -3,7 +3,7 @@
 # but use this iformation in find_* only
 if(NOT GSL_INCLUDEDIR)
 include(FindPkgConfig)
-pkg_check_modules(PKGGSL gsl)
+pkg_check_modules(PKGGSL QUIET gsl)
 
 if(NOT PKGGSL_LIBRARIES)
 	set(PKGGSL_LIBRARIES gsl)
@@ -19,6 +19,7 @@
 	PATH_SUFFIXES include/gsl include
 	PATHS ${kst_3rdparty_dir} ${PKGGSL_INCLUDEDIR})
 
+set(GSL_LIBRARY_LIST)
 foreach(it ${PKGGSL_LIBRARIES})
 	set(lib lib-NOTFOUND CACHE STRING "" FORCE)
 	FIND_LIBRARY(lib ${it} 
@@ -26,8 +27,10 @@
 		ENV GSL_DIR
 		PATH_SUFFIXES lib
 		PATHS ${kst_3rdparty_dir} ${PKGGSL_LIBRARY_DIRS})
-	list(APPEND GSL_LIBRARIES ${lib})
+	list(APPEND GSL_LIBRARY_LIST ${lib})
 endforeach()
+set(GSL_LIBRARIES ${GSL_LIBRARY_LIST} CACHE STRING "" FORCE)
+
 endif()
 
 if(GSL_INCLUDEDIR AND GSL_LIBRARIES)
--- branches/work/kst/portto4/kst/cmake/modules/FindMatio.cmake #1286216:1286217
@@ -3,7 +3,7 @@
 
 if(NOT MATIO_INCLUDEDIR)
 include(FindPkgConfig)
-pkg_check_modules(PKGMATIO matio)
+pkg_check_modules(PKGMATIO QUIET matio)
 
 if(NOT PKGMATIO_LIBRARIES)
 	set(PKGMATIO_LIBRARIES matio)
@@ -19,6 +19,7 @@
 	PATH_SUFFIXES include
 	PATHS ${kst_3rdparty_dir} ${PKGMATIO_INCLUDEDIR})
 
+set(MATIO_LIBRARY_LIST)
 foreach(it ${PKGMATIO_LIBRARIES})
 	set(lib lib-NOTFOUND CACHE STRING "" FORCE)
 	FIND_LIBRARY(lib ${it} 
@@ -26,11 +27,13 @@
 		ENV MATIO_DIR
 		PATH_SUFFIXES lib
 		PATHS ${kst_3rdparty_dir} ${PKGMATIO_LIBRARY_DIRS})
-	list(APPEND MATIO_LIBRARIES ${lib})
+	list(APPEND MATIO_LIBRARY_LIST ${lib})
 endforeach()
+set(MATIO_LIBRARIES ${MATIO_LIBRARY_LIST} CACHE STRING "" FORCE)
 
 endif()
 
+
 if(MATIO_INCLUDEDIR AND MATIO_LIBRARIES)
 	set(MATIO_INCLUDE_DIR ${MATIO_INCLUDEDIR} ${MATIO_INCLUDEDIR}/..)
 	set(matio 1)
--- branches/work/kst/portto4/kst/cmake/modules/FindNetcdf.cmake #1286216:1286217
@@ -7,7 +7,7 @@
 if(NETCDF_INCLUDEDIR AND NETCDF_LIBRARIES)
 	FIND_LIBRARY(NETCDF_LIBRARY_CPP netcdf_c++ 
 		HINTS ${NETCDF_LIBRARY_DIRS})	
-	set(NETCDF_LIBRARY_C -L${NETCDF_LIBRARY_DIRS} ${NETCDF_LIBRARIES})
+	set(NETCDF_LIBRARY_C -L${NETCDF_LIBRARY_DIRS} ${NETCDF_LIBRARIES} CACHE STRING "" FORCE)
 else()
 	set(NETCDF_INCLUDEDIR NETCDF_INCLUDEDIR-NOTFOUND CACHE STRING "" FORCE)
 	FIND_PATH(NETCDF_INCLUDEDIR netcdf.h
@@ -34,16 +34,16 @@
 	find_netcdf_lib(netcdf_cpp_debug netcdf_c++d)
 	
 	if(netcdf_c AND netcdf_c_debug)
-		set(NETCDF_LIBRARY_C optimized ${netcdf_c} debug ${netcdf_c_debug})
+		set(NETCDF_LIBRARY_C optimized ${netcdf_c} debug ${netcdf_c_debug} CACHE STRING "" FORCE)
 	endif()
 	if(netcdf_cpp AND netcdf_cpp_debug)
-	   set(NETCDF_LIBRARY_CPP optimized ${netcdf_cpp} debug ${netcdf_cpp_debug})
+	   set(NETCDF_LIBRARY_CPP optimized ${netcdf_cpp} debug ${netcdf_cpp_debug} CACHE STRING "" FORCE)
 	endif()
 	
 	if(NOT MSVC)
 		# only msvc needs debug and release
-		set(NETCDF_LIBRARY_C   ${netcdf_c})
-		set(NETCDF_LIBRARY_CPP ${netcdf_cpp})
+		set(NETCDF_LIBRARY_C   ${netcdf_c}   CACHE STRING "" FORCE)
+		set(NETCDF_LIBRARY_CPP ${netcdf_cpp} CACHE STRING "" FORCE)
 	endif()
 endif()
 endif()