From: Matthias Maier Date: Tue, 25 Sep 2012 10:01:47 +0000 (+0000) Subject: blubb X-Git-Tag: v8.0.0~1079^2~660 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c8193d345ac483f300b48ed91f0dd2d375a0b37a;p=dealii.git blubb git-svn-id: https://svn.dealii.org/branches/branch_cmake@26712 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/CMakeLists.txt b/deal.II/CMakeLists.txt index 893672ae82..42a3c7415e 100644 --- a/deal.II/CMakeLists.txt +++ b/deal.II/CMakeLists.txt @@ -1,4 +1,5 @@ +SET(VERSION "8.0.pre") ########################################################################### ## ## @@ -8,17 +9,13 @@ ########################################################################### # -# This is the main CMakeLists.txt file for the deal.II project +# The cmake build system for the deal.II project # # The main purpose of this file is to set all the configuration options and # then call a lot of modules residing under ./cmake/*/ that do the # hard work. # -SET(VERSION "8.0.pre") - - - ########################################################################### # # @@ -31,7 +28,6 @@ SET(VERSION "8.0.pre") # is a choice, e.g. from contrib vs external) # - OPTION(DEAL_II_FEATURE_AUTODETECTION # Enables feature autodetection. This will automatically overwrite all # DEAL_II_WITH_<...> toggles depending on whether they can be supported or @@ -158,8 +154,6 @@ OPTION(DEAL_II_COMPONENT_PROJECT_CONFIG ON) - - ########################################################################### # # # Configuration: # @@ -258,6 +252,12 @@ ADD_SUBDIRECTORY(scripts) ADD_SUBDIRECTORY(include) +# +# Build optional contrib targets: +# +ADD_SUBDIRECTORY(contrib) + + # # Compile and install the library: # diff --git a/deal.II/cmake/setup_finalize.cmake b/deal.II/cmake/setup_finalize.cmake index 45ddaecdc0..5e3f4d76c2 100644 --- a/deal.II/cmake/setup_finalize.cmake +++ b/deal.II/cmake/setup_finalize.cmake @@ -1,15 +1,13 @@ + # # Finalize the configuration: # - # # Hide some cmake specific cached variables. This is annoying... # -MARK_AS_ADVANCED( - file_cmd - ) +MARK_AS_ADVANCED(file_cmd) #