[Merge][CMake] Merged revisions : 6580

Revision  r6580
.----------------------
[CMake] libdunecommon.a is build, even if it is placed in the wrong
directory.
[CMake] make builds more than half of the tests.

.----------------------


[[Imported from SVN: r7135]]

CMakeLists.txt

@@ -11,6 +11,10 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/modules")
 
 # include dune-common to include pathtest
 include_directories("${CMAKE_SOURCE_DIR}")
+link_directories("${CMAKE_SOURCE_DIR}")
+# set(RUNTIME_OUTPUT_DIRECTORY "${CMAKE_SOURCE_DIR}/lib")
+# set(ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_SOURCE_DIR}/lib")
+# set(LIBRARY_OUTPUT_DIRECTORY "${CMAKE_SOURCE_DIR}/lib")
 
 # set required compiler flags for C++11 (former C++0x)
 find_package(CXX11Features)
@@ -30,7 +34,8 @@ set(HAVE_BOOST BOOST_FOUND)
 find_package(SharedPtr)
 
 # actually write the config.h file to disk
-configure_file(dune-common-config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/dune-common-config.h)
+configure_file(config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h)
+add_definitions(-DHAVE_CONFIG_H)
 
 # add subdirectories to execute CMakeLIsts.txt there
 add_subdirectory("dune")

dune-common-config.h.cmake

-#cmakedefine01 HAVE_ARRAY
-#cmakedefine01 HAVE_MPI
-#cmakedefine01 HAVE_MEMORY
-#cmakedefine01 HAVE_MALLOC_H
-#cmakedefine01 HAVE_BOOST
-
-/* If this is set, the member 'size' of FieldVector is a method rather than an
-   enum */
-#define DUNE_COMMON_FIELDVECTOR_SIZE_IS_METHOD
-
-/* Define to 1 if the <array> C++11 is available and support array::fill */
-#cmakedefine HAVE_ARRAY
-
-/* Define to 1 if you have the <memory> header file. */
-#cmakedefine HAVE_MEMORY
-
-/* The namespace in which SHARED_PTR can be found */
-#cmakedefine SHARED_PTR_NAMESPACE ${SHARED_PTR_NAMESPACE}
-
-/* The header in which SHARED_PTR can be found */
-#cmakedefine SHARED_PTR_HEADER ${SHARED_PTR_HEADER}
-
-/* Define to 1 if SHARED_PTR_NAMESPACE::make_shared is usable */
-#cmakedefine HAVE_MAKE_SHARED
-
-/* Define to 1 if you have <boost/make_shared.hpp> */
-#cmakedefine HAVE_BOOST_MAKE_SHARED_HPP
-
-#cmakedefine01 HAVE_NULLPTR
-#cmakedefine01 HAVE_STATIC_ASSERT
-#cmakedefine01 HAVE_VARIADIC_TEMPLATES
-#cmakedefine01 HAVE_VARIADIC_CONSTRUCTOR_SFINAE
-#cmakedefine01 HAVE_RVALUE_REFERENCES
-
-/* Include allways usefull headers */
-#include <dune/common/deprecated.hh>
-#include <dune/common/unused.hh>

dune/common/CMakeLists.txt

 add_subdirectory("parallel")
 add_subdirectory("test")
+
+add_library("dunecommon"
+	exceptions.cc
+	fmatrixev.cc
+	ios_state.cc
+	parametertree.cc
+	parametertreeparser.cc
+	path.cc
+	stdstreams.cc)

dune/common/parallel/test/CMakeLists.txt

 add_executable("indexsettest" indexsettest.cc)
+target_link_libraries("indexsettest" "dunecommon")
+
 add_executable("indicestest" indicestest.cc)
+target_link_libraries("indicestest" "dunecommon")
+
 add_executable("selectiontest" selectiontest.cc)
+target_link_libraries("selectiontest" "dunecommon")
+
 add_executable("syncertest" syncertest.cc)

dune/common/test/CMakeLists.txt

 add_executable("arraylisttest" arraylisttest.cc)
 add_executable("arraytest" arraytest.cc)
+
 add_executable("bigunsignedinttest" bigunsignedinttest.cc)
+target_link_libraries("bigunsignedinttest" "dunecommon")
+
 add_executable("bitsetvectortest" bitsetvectortest.cc)
 add_executable("conversiontest" conversiontest.cc)
 add_executable("deprtuplestest" deprtuplestest.cc)
+
 add_executable("dynmatrixtest" dynmatrixtest.cc)
+target_link_libraries("dynmatrixtest" "dunecommon")
+
 add_executable("dynvectortest" dynvectortest.cc)
 add_executable("enumsettest" enumsettest.cc)
+
 add_executable("fassigntest" fassigntest.cc)
+target_link_libraries("fassigntest" "dunecommon")
+
 add_executable("fmatrixtest" fmatrixtest.cc)
+target_link_libraries("fmatrixtest" "dunecommon")
+
 add_executable("fvectortest" fvectortest.cc)
 add_executable("gcdlcmtest" gcdlcmtest.cc)
 add_executable("iteratorfacadetest2" iteratorfacadetest2.cc)
 add_executable("iteratorfacadetest" iteratorfacadetest.cc)
 add_executable("lrutest" lrutest.cc)
+
 add_executable("mpiguardtest" mpiguardtest.cc)
+target_link_libraries("mpiguardtest" "dunecommon")
+
 add_executable("mpihelpertest" mpihelpertest.cc)
-add_executable("nullptr-test2" nullptr-test2.cc)
 add_executable("nullptr-test" nullptr-test.cc)
+
+#add_executable("nullptr-test2" nullptr-test2.cc)
+#target_link_libraries("nullptr-test2" "dunecommon")
+
 add_executable("parametertreetest" parametertreetest.cc)
+target_link_libraries("parametertreetest" "dunecommon")
+
 add_executable("pathtest" pathtest.cc)
+target_link_libraries("pathtest" "dunecommon")
+
 add_executable("poolallocatortest" poolallocatortest.cc)
 add_executable("shared_ptrtest" shared_ptrtest.cc)
 add_executable("singletontest" singletontest.cc)
 add_executable("sllisttest" sllisttest.cc)
 add_executable("static_assert_test" static_assert_test.cc)
-add_executable("static_assert_test_fail" static_assert_test_fail.cc)
+#add_executable("static_assert_test_fail" static_assert_test_fail.cc)
+
 add_executable("streamtest" streamtest.cc)
-add_executable("testfassign2" testfassign2.cc)
-add_executable("testfassign" testfassign.cc)
-add_executable("testfconstruct" testfconstruct.cc)
+target_link_libraries("streamtest" "dunecommon")
+
+#add_executable("testfassign" testfassign.cc)
+#add_executable("testfassign2" testfassign2.cc)
+#add_executable("testfconstruct" testfconstruct.cc)
+
 add_executable("test-stack" test-stack.cc)
+target_link_libraries("test-stack" "dunecommon")
+
 add_executable("tuplestest" tuplestest.cc)
 add_executable("tupleutilitytest" tupleutilitytest.cc)
 add_executable("utilitytest" utilitytest.cc)