CMake: Split the "contrib" component into two separate "mesh_converter" and "paramete...

git-svn-id: https://svn.dealii.org/trunk@29168 0785d39b-7218-0410-832d-ea1e28bc413d

diff --git a/deal.II/cmake/setup_cached_variables.cmake b/deal.II/cmake/setup_cached_variables.cmake
index 27b2a53c5e81bf249b21bbbc162661a263b25298..8d38aeab6735eb3dfe2ae904a4d2badd9c1064b3 100644 (file)
--- a/deal.II/cmake/setup_cached_variables.cmake
+++ b/deal.II/cmake/setup_cached_variables.cmake
@@ -19,12 +19,13 @@
 #
 # General configuration options:
 #
+#     DEAL_II_ALLOW_AUTODETECTION
 #     DEAL_II_ALLOW_BUNDLED
 #     DEAL_II_COMPONENT_COMPAT_FILES
-#     DEAL_II_COMPONENT_CONTRIB
 #     DEAL_II_COMPONENT_DOCUMENTATION
 #     DEAL_II_COMPONENT_EXAMPLES
-#     DEAL_II_ALLOW_AUTODETECTION
+#     DEAL_II_COMPONENT_MESH_CONVERTER
+#     DEAL_II_COMPONENT_PARAMETER_GUI
 #     DEAL_II_FORCE_AUTODETECTION
 #
 # Options regarding compilation and linking:
@@ -66,11 +67,6 @@ OPTION(DEAL_II_COMPONENT_COMPAT_FILES
   ON
   )
 
-OPTION(DEAL_II_COMPONENT_CONTRIB
-  "Enable installation of contrib packages. This adds a COMPONENT \"contrib\" to the build system."
-  OFF
-  )
-
 If(DEAL_II_HAVE_DOC_DIRECTORY)
   OPTION(DEAL_II_COMPONENT_DOCUMENTATION
     "Enable configuration, build and installation of the documentation. This adds a COMPONENT \"documentation\" to the build system."
@@ -83,6 +79,16 @@ OPTION(DEAL_II_COMPONENT_EXAMPLES
   ON
   )
 
+OPTION(DEAL_II_COMPONENT_MESH_CONVERTER
+  "Build and install the mesh_converter. This adds a COMPONENT \"mesh_converter\" to the build system."
+  OFF
+  )
+
+OPTION(DEAL_II_COMPONENT_PARAMETER_GUI
+  "Build and install the parameter_gui. This adds a COMPONENT \"parameter_gui\" to the build system."
+  OFF
+  )
+
 OPTION(DEAL_II_ALLOW_AUTODETECTION
   "Allow to automatically setup features by setting all undefined DEAL_II_WITH_* variables to ON or OFF"
   ON
@@ -254,7 +260,7 @@ FOREACH(_var ${_res})
     SET(DEAL_II_${_var} ${${_var}} CACHE BOOL "" FORCE)
     UNSET(${_var} CACHE)
   ENDIF()
-  IF(_var MATCHES "^(COMPAT_FILES|DOCUMENTATION|EXAMPLES|CONTRIB)")
+  IF(_var MATCHES "^(COMPAT_FILES|DOCUMENTATION|EXAMPLES|MESH_CONVERTER|PARAMETER_GUI)")
     SET(DEAL_II_COMPONENT_${_var} ${${_var}} CACHE BOOL "" FORCE)
     UNSET(${_var} CACHE)
   ENDIF()

diff --git a/deal.II/cmake/setup_custom_targets.cmake b/deal.II/cmake/setup_custom_targets.cmake
index a348a6dda7569ff775841436b63409a620fd20e6..2f7b56efa842f0c1cabeb66a0d461d9062e492fd 100644 (file)
--- a/deal.II/cmake/setup_custom_targets.cmake
+++ b/deal.II/cmake/setup_custom_targets.cmake
@@ -42,12 +42,3 @@ IF(DEAL_II_COMPONENT_COMPAT_FILES)
       report_features
     )
 ENDIF()
-
-IF(DEAL_II_COMPONENT_CONTRIB)
-  ADD_CUSTOM_TARGET(contrib
-    DEPENDS
-      mesh_conversion
-      parameter_gui
-    )
-ENDIF()
-

diff --git a/deal.II/contrib/CMakeLists.txt b/deal.II/contrib/CMakeLists.txt
index 60dc9e9c68b1fe1160db4e422d0c6e5674defa32..c6569084fbebbde9fe3fc399b9261860f5d5d368 100644 (file)
--- a/deal.II/contrib/CMakeLists.txt
+++ b/deal.II/contrib/CMakeLists.txt
@@ -12,8 +12,11 @@
 ##
 #####
 
-IF(DEAL_II_COMPONENT_CONTRIB)
+IF(DEAL_II_COMPONENT_MESH_CONVERTER)
   ADD_SUBDIRECTORY(mesh_conversion)
+ENDIF()
+
+IF(DEAL_II_COMPONENT_PARAMETER_GUI)
   ADD_SUBDIRECTorY(parameter_gui)
 ENDIF()
 

diff --git a/deal.II/contrib/mesh_conversion/CMakeLists.txt b/deal.II/contrib/mesh_conversion/CMakeLists.txt
index 429976f687b32312ec78d7ce9fd73e35fc3bca50..c19810410340b2cf552d2a6f3401e8639918c6ea 100644 (file)
--- a/deal.II/contrib/mesh_conversion/CMakeLists.txt
+++ b/deal.II/contrib/mesh_conversion/CMakeLists.txt
@@ -1,6 +1,6 @@
 #####
 ##
-## Copyright (C) 2012 by the deal.II authors
+## Copyright (C) 2012, 2013 by the deal.II authors
 ##
 ## This file is part of the deal.II library.
 ##
@@ -15,9 +15,9 @@
 #####
 
 CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
-#PROJECT(parameter_gui)
+#PROJECT(mesh_converter)
 
-ADD_EXECUTABLE(mesh_conversion
+ADD_EXECUTABLE(mesh_converter
   Main.cc
   MeshConversion.cc
   )
@@ -26,9 +26,9 @@ IF("${DEAL_II_EXECUTABLE_RELDIR}" STREQUAL "")
   SET(DEAL_II_EXECUTABLE_RELDIR "bin")
 ENDIF()
 
-INSTALL(TARGETS mesh_conversion
+INSTALL(TARGETS mesh_converter
   RUNTIME
   DESTINATION ${DEAL_II_EXECUTABLE_RELDIR}
-  COMPONENT contrib
+  COMPONENT mesh_converter
   )
 

diff --git a/deal.II/contrib/parameter_gui/CMakeLists.txt b/deal.II/contrib/parameter_gui/CMakeLists.txt
index a5292b141044baf9807f8f1bcae744826974ff3f..929bb5e2a141dde23f60379342eb37e820fc41cb 100644 (file)
--- a/deal.II/contrib/parameter_gui/CMakeLists.txt
+++ b/deal.II/contrib/parameter_gui/CMakeLists.txt
@@ -1,6 +1,6 @@
 #####
 ##
-## Copyright (C) 2012 by the deal.II authors
+## Copyright (C) 2012, 2013 by the deal.II authors
 ##
 ## This file is part of the deal.II library.
 ##
@@ -13,7 +13,7 @@
 #####
 
 CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
-#PROJECT(parameterGUI)
+#PROJECT(parameter_gui)
 
 FIND_PACKAGE(Qt4 REQUIRED QtCore QtGui QtXml)
 MARK_AS_ADVANCED(QT_QMAKE_EXECUTABLE)
@@ -33,7 +33,7 @@ QT4_ADD_RESOURCES(SOURCE_RCC
   application.qrc
   )
 
-ADD_EXECUTABLE(parameterGUI
+ADD_EXECUTABLE(parameter_gui
   browse_lineedit.cpp
   info_message.cpp
   main.cpp
@@ -45,15 +45,15 @@ ADD_EXECUTABLE(parameterGUI
   ${SOURCE_RCC}
   )
 
-TARGET_LINK_LIBRARIES(parameterGUI ${QT_LIBRARIES})
+TARGET_LINK_LIBRARIES(parameter_gui ${QT_LIBRARIES})
 
 IF("${DEAL_II_EXECUTABLE_RELDIR}" STREQUAL "")
   SET(DEAL_II_EXECUTABLE_RELDIR "bin")
 ENDIF()
 
-INSTALL(TARGETS parameterGUI
+INSTALL(TARGETS parameter_gui
   RUNTIME
   DESTINATION ${DEAL_II_EXECUTABLE_RELDIR}
-  COMPONENT contrib
+  COMPONENT parameter_gui
   )
 

diff --git a/deal.II/doc/development/Config.sample b/deal.II/doc/development/Config.sample
index 30b3671fe4adafec5f644412ef3d4641e34e41a6..28d2dbf940e9f263c119630a242d552626c24682 100644 (file)
--- a/deal.II/doc/development/Config.sample
+++ b/deal.II/doc/development/Config.sample
@@ -20,10 +20,6 @@
 #   "Enable installation of the example steps. This adds a COMPONENT \"compat_files\" to the build system."
 #   )
 #
-# SET(DEAL_II_COMPONENT_CONTRIB OFF CACHE BOOL
-#   "Enable installation of contrib packages. This adds a COMPONENT \"contrib\" to the build system."
-#   )
-#
 # SET(DEAL_II_COMPONENT_DOCUMENTATION OFF CACHE BOOL
 #   "Enable configuration, build and installation of the html documentation. This adds a COMPONENT \"documentation\" to the build system."
 #   )
@@ -32,6 +28,14 @@
 #   "Enable configuration and installation of the example steps. This adds a COMPONENT \"examples\" to the build system."
 #   )
 #
+# SET(DEAL_II_COMPONENT_MESH_CONVERTER OFF CACHE BOOL
+#   "Build and install the mesh_converter. This adds a COMPONENT \"mesh_converter\" to the build system."
+#   )
+#
+# SET(DEAL_II_COMPONENT_PARAMETER_GUI OFF CACHE BOOL
+#   "Build and install the parameter_gui. This adds a COMPONENT \"parameter_gui\" to the build system."
+#   )
+#
 
 
 #

diff --git a/deal.II/doc/development/cmake.html b/deal.II/doc/development/cmake.html
index debc969fc59dbfd541ef3a40beffe826b884c86d..a08f6996ff445b59b614acfb995e60f2bd4f1bda 100644 (file)
--- a/deal.II/doc/development/cmake.html
+++ b/deal.II/doc/development/cmake.html
@@ -438,19 +438,6 @@
       <acronym>deal.II</acronym> will be configured, built and installed:
 
       <ul>
-       <li>
-          <p>
-            <code>DEAL_II_COMPONENT_CONTRIB</code> (default
-            <code>OFF</code>):
-          </p>
-          <p>
-            Enable configuration and installation of programs
-            in <code>contrib/</code>. This adds a component
-            <code>contrib</code> to the build system.
-            Beware of the fact that <code>contrib</code> needs
-            development packages for Qt.
-          </p>
-
        <li>
           <p>
             <code>DEAL_II_COMPONENT_COMPAT_FILES</code>
@@ -485,6 +472,30 @@
             not generate the documentation for the tutorial steps).
             This adds a component <code>examples</code> to the build system.
           </p>
+
+       <li>
+          <p>
+            <code>DEAL_II_COMPONENT_MESH_CONVERTER</code> (default
+            <code>OFF</code>):
+          </p>
+          <p>
+            Enable configuration and installation of the
+            <code>mesh_converter</code> binary. This adds a component
+            <code>mesh_converter</code> to the build system.
+         </p>
+
+       <li>
+          <p>
+            <code>DEAL_II_COMPONENT_PARAMETER_GUI</code> (default
+            <code>OFF</code>):
+          </p>
+          <p>
+            Enable configuration and installation of the
+            <code>parameter_gui</code> binary. This adds a component
+            <code>parameter_gui</code> to the build system. Beware of the
+            fact that this component needs development packages for Qt.
+         </p>
+
       </ul>
     </p>
 

diff --git a/deal.II/doc/readme.html b/deal.II/doc/readme.html
index f5edeaf7f88b039e87f3e092546bd0aeaa53fe65..68c00eb0cbde5efd5db0874ff675f0b342123a6a 100644 (file)
--- a/deal.II/doc/readme.html
+++ b/deal.II/doc/readme.html
@@ -388,17 +388,20 @@
 
       <li>
         <p>
-          If you wish to install projects residing under
-          <code>contrib/</code> such as ParameterGUI,
-          specify <code>-DDEAL_II_COMPONENT_CONTRIB=ON</code>.
-          Beware of the fact that parameterGUI needs
-          development packages for Qt.
+          <i>mesh_converter</i>: If you wish to compile and install the
+          mesh_converter, specify
+          <code>-DDEAL_II_COMPONENT_MESH_CONVERTER=ON</code>.
+       </p>
+        <p>
+          <i>parameter_gui</i>: If you wish to compile and install the
+          parameter_gui, specify
+          <code>-DDEAL_II_COMPONENT_PARAMETER_GUI=ON</code>. Beware of the
+          fact that parameterGUI needs development packages for Qt.
        </p>
     </ul>
 
 
 
-
     <a name="optional-software"></a>
     <h4>Optional interfaces to other software packages</h4>