45 lines
1.3 KiB
Diff
45 lines
1.3 KiB
Diff
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index dc069408..3971e6aa 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -2,7 +2,7 @@
|
|
project("dune-pdelab" C CXX)
|
|
|
|
# general stuff
|
|
-cmake_minimum_required(VERSION 2.8.12)
|
|
+cmake_minimum_required(VERSION 3.6)
|
|
|
|
# guess dune-common build dir
|
|
if(NOT (dune-common_DIR OR dune-common_ROOT OR
|
|
@@ -25,26 +25,18 @@ dune_project()
|
|
# Disable the upstream testing magic, that builds tests during "make test"
|
|
set(DUNE_TEST_MAGIC OFF)
|
|
|
|
-# To have enable all packages work with cmake-2.8, the module
|
|
-# libraries need to be added before the call to dune_enable_all_packages()
|
|
-# With cmake 3.1, one would use the MODULE_LIBRARIES argument of
|
|
-# dune_enable_all_packages() instead.
|
|
+# Use the enable all packages feature
|
|
+dune_enable_all_packages(MODULE_LIBRARIES dunepdelab)
|
|
|
|
if(NOT MINGW)
|
|
set(clock_cc "dune/pdelab/common/clock.cc")
|
|
endif()
|
|
|
|
-dune_add_library(dunepdelab
|
|
+dune_library_add_sources(dunepdelab SOURCES
|
|
${clock_cc}
|
|
dune/pdelab/common/hostname.cc
|
|
dune/pdelab/common/logtag.cc
|
|
- )
|
|
-dune_target_enable_all_packages(dunepdelab)
|
|
-
|
|
-dune_register_package_flags(LIBRARIES dunepdelab)
|
|
-
|
|
-# Use the enable all packages feature
|
|
-dune_enable_all_packages()
|
|
+)
|
|
|
|
add_subdirectory(doc)
|
|
add_subdirectory(dune/pdelab)
|