[cmake] rewire dune libs discovery/ dune module adding

CMakeLists.txt

@@ -49,13 +49,12 @@ LINK_DIRECTORIES( "/usr/lib" ${CCGNU_LIBRARY_DIRS} )
 
 FILE( GLOB_RECURSE stuff "${CMAKE_CURRENT_SOURCE_DIR}/dune/stuff/*.hh" )
 
-set( COMMON_LIBS "grid" "fem" "common"  ${BLAS_LIB} "GL" ${ParaLIBS} ${CCGNU_LIBRARIES} "boost_filesystem")
+set( COMMON_LIBS ${DUNE_LIBS} ${BLAS_LIB} "GL" ${ParaLIBS} ${CCGNU_LIBRARIES} "boost_filesystem")
 set( COMMON_HEADER ${stuff} ${DUNE_HEADERS} )
 set_source_files_properties( ${COMMON_HEADER} PROPERTIES HEADER_FILE_ONLY 1 )
 
 LINK_DIRECTORIES( "/usr/lib" )
 
-INCLUDE_SYS_DIR( ${CMAKE_CURRENT_SOURCE_DIR}/dune/stuff/test/gtest/include )
 HEADERCHECK( ${stuff} )
 DEPENDENCYCHECK( ${stuff} )
 ADD_DEFINITIONS( ${MY_CXX_FLAGS} )

cmake/DuneUtils.cmake

@@ -87,15 +87,19 @@ ENDMACRO( ADD_CPPCHECK )
 MACRO( ADD_DUNE_MODULES )
 	FOREACH( MODULE ${ARGN} )
 		INCLUDE_SYS_DIR( ${CMAKE_CURRENT_SOURCE_DIR}/../dune-${MODULE} )
-		LINK_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../dune-${MODULE}/lib/.libs )
-		string(TOUPPER ${MODULE} UPMODULE )
-		ADD_CXX_FLAGS( -DHAVE_DUNE_${UPMODULE} )
-		FILE( GLOB_RECURSE tmp_header "${CMAKE_CURRENT_SOURCE_DIR}/../dune-${MODULE}/dune/${MODULE}/*.hh" )
-		LIST( APPEND DUNE_HEADERS ${tmp_header} )
-		SET( tmp_lib ${CMAKE_CURRENT_SOURCE_DIR}/../dune-${MODULE}/lib/.libs/libdune${MODULE}.a  )
-		IF( EXISTS ${tmp_lib} )
-			LIST( APPEND DUNE_LIBS ${tmp_lib} )
-		ENDIF( EXISTS ${tmp_lib} )
+		set( ${MODULE}_LIBDIR ${CMAKE_CURRENT_SOURCE_DIR}/../dune-${MODULE}/lib/.libs)
+		LINK_DIRECTORIES( ${${MODULE}_LIBDIR} )
+		SET( LIBNAME libdune${MODULE}.a )
+		find_library( ${MODULE}_FOUND ${LIBNAME} PATHS ${${MODULE}_LIBDIR})
+		if ( ${MODULE}_FOUND )
+			string(TOUPPER ${MODULE} UPMODULE )
+			ADD_CXX_FLAGS( -DHAVE_DUNE_${UPMODULE} )
+			FILE( GLOB_RECURSE ${MODULE}_HEADER "${CMAKE_CURRENT_SOURCE_DIR}/../dune-${MODULE}/dune/${MODULE}/*.hh" )
+			LIST( APPEND DUNE_HEADERS ${${MODULE}_HEADER} )
+			LIST( APPEND DUNE_LIBS ${${MODULE}_FOUND} )
+		else()
+			MESSAGE(STATUS "did not find library ${LIBNAME}: did not add dune-${MODULE}")
+		endif()
 	ENDFOREACH(MODULE)
 ENDMACRO( ADD_DUNE_MODULES )