[cig-commits] [commit] master: use the recommended way to set up the CMakeLists for shared libs (ff77a48)

[cig_noreply at geodynamics.org]

Repository : https://github.com/geodynamics/aspect

On branch  : master
Link       : https://github.com/geodynamics/aspect/compare/c883fc069e0dcc93cce45e1d52c84c05c9c4385b...1f4ab820b0191d9a4058b78c91b629bc94c437ec

>---------------------------------------------------------------

commit ff77a48cfc273aff8ee5f2b1e883e225b0bd1a0b
Author: Timo Heister <timo.heister at gmail.com>
Date:   Fri May 16 17:27:01 2014 -0400

    use the recommended way to set up the CMakeLists for shared libs


>---------------------------------------------------------------

ff77a48cfc273aff8ee5f2b1e883e225b0bd1a0b
 benchmark/inclusion/CMakeLists.txt | 16 +++++++---------
 benchmark/inclusion/test.prm       |  2 +-
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/benchmark/inclusion/CMakeLists.txt b/benchmark/inclusion/CMakeLists.txt
index 0523408..8d8910b 100644
--- a/benchmark/inclusion/CMakeLists.txt
+++ b/benchmark/inclusion/CMakeLists.txt
@@ -1,12 +1,10 @@
-cmake_minimum_required(VERSION 2.8)
-
-SET(TARGET "source")
-FIND_PACKAGE(deal.II 8.0 QUIET
-  HINTS ${deal.II_DIR} ${DEAL_II_DIR} ../ ../../ $ENV{DEAL_II_DIR}
-  )
+CMAKE_MINIMUM_REQUIRED(VERSION 2.8.8)
 
+FIND_PACKAGE(Aspect REQUIRED HINTS ${ASPECT_DIR} ../ ../../ $ENV{ASPECT_DIR})
 DEAL_II_INITIALIZE_CACHED_VARIABLES()
-INCLUDE_DIRECTORIES(../../include)
 
-ADD_LIBRARY(${TARGET} SHARED  source.cc)
-DEAL_II_SETUP_TARGET(${TARGET})
+SET(TARGET "plugin")
+PROJECT(${TARGET})
+
+ADD_LIBRARY(${TARGET} SHARED source.cc)
+ASPECT_SETUP_PLUGIN(${TARGET})
diff --git a/benchmark/inclusion/test.prm b/benchmark/inclusion/test.prm
index 75d31a8..ac88a02 100644
--- a/benchmark/inclusion/test.prm
+++ b/benchmark/inclusion/test.prm
@@ -1,6 +1,6 @@
 ############### Global parameters
 
-set Additional shared libraries            = benchmark/inclusion/libsource.so
+set Additional shared libraries            = benchmark/inclusion/libplugin.so
 
 
 set Dimension                              = 2