]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
cosmetic changes
authormaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Fri, 21 Sep 2012 22:55:41 +0000 (22:55 +0000)
committermaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Fri, 21 Sep 2012 22:55:41 +0000 (22:55 +0000)
git-svn-id: https://svn.dealii.org/branches/branch_cmake@26617 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/README_CMAKE
deal.II/cmake/configure/configure_1_mpi.cmake
deal.II/cmake/configure/configure_1_tbb.cmake
deal.II/cmake/configure/configure_blas.cmake
deal.II/cmake/configure/configure_lapack.cmake
deal.II/cmake/macros/macro_configure_feature.cmake
deal.II/config/CMakeLists.txt
deal.II/config/Make.global_options.in

index abc070b1fa0628b3b38db1acc8cf37afaa596ecd..e1360604188cabbf35f8338e4d51d9207fe7fec1 100644 (file)
@@ -1,13 +1,13 @@
 
 
 
-            ==============================================
+          ==================================================
 
             The cmake build system for the deal.II project
 
-            ==============================================
+          ==================================================
 
-            Author: maier, 2012
+          Author: Matthias Maier, University Heidelberg 2012
 
 
 
@@ -58,7 +58,6 @@ Quick start
       $ mkdir build
       $ cd build
       $ cmake -DCMAKE_INSTALL_PREFIX=/path/install/dir ../
-      $ make
       $ make install
 
 
@@ -78,10 +77,16 @@ Useful bits
     ( $ cd build )
       $ cmake -D<OPTION>=<VALUE> [...] path/to/source/tree
 
+* Configure with autodetection, afterwards disable a feature:
+
+    ( $ cd build )
+      $ cmake -DDEAL_II_FEATURE_AUTODETECTION=ON ../
+      $ cmake -DDEAL_II_FEATURE_AUTODETECTION=OFF -DDEAL_II_WITH_METIS=OFF ../
+      $ make install
 
 * Build and install only a specific component:
 
-      $ cd build
+    ( $ cd build )
       $ make <component>
       $ cmake -DCOMPONENT=<component> -P build/cmake_install.cmake
 
index d2cc849ba531f2204e97cbdcfdbbf939191c623e..c816fac89b1878fab518ce9be9f743e181afa255 100644 (file)
@@ -6,6 +6,12 @@ MACRO(FEATURE_MPI_FIND_EXTERNAL var)
   FIND_PACKAGE(MPI)
 
   IF(MPI_CXX_FOUND)
+    # Hide some variables:
+    MARK_AS_ADVANCED(
+      MPI_EXTRA_LIBRARY
+      MPI_LIBRARY
+      )
+
     SET(${var} TRUE)
   ENDIF()
 ENDMACRO()
index 159e3cf975fdb5394c1e147b4728514d3926488c..27f2e530e58f57ed3bd75730b78009148cd7fe12 100644 (file)
@@ -11,11 +11,15 @@ MACRO(SETUP_THREADING var)
   FIND_PACKAGE(Threads)
 
   IF(Threads_FOUND)
+    MARK_AS_ADVANCED(
+      pthread_LIBRARY
+      )
     SET(${var} TRUE)
 
     #
     # We support threading. Go on and configure the rest:
     #
+
     ADD_FLAGS(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_THREAD_LIBS_INIT}")
     SET(DEAL_II_USE_MT TRUE)
 
index 31374c3c00fc42619e4e0be7cd485d3e9465f3b3..862b66c6cee0ddc5a07ba47791bb28fe5ee459a7 100644 (file)
@@ -6,6 +6,11 @@ MACRO(FEATURE_BLAS_FIND_EXTERNAL var)
   FIND_PACKAGE(BLAS)
 
   IF(BLAS_FOUND)
+    MARK_AS_ADVANCED(
+      atlas_LIBRARY
+      blas_LIBRARY
+      cblas_LIBRARY
+      )
     SET(${var} TRUE)
   ENDIF()
 ENDMACRO()
index 3c75f872ec12c4e2e968b07440da180dc695c79f..33de4350edd497ea5e57246fa79eab3e1684f8f9 100644 (file)
@@ -6,6 +6,9 @@ MACRO(FEATURE_LAPACK_FIND_EXTERNAL var)
   FIND_PACKAGE(LAPACK)
 
   IF(LAPACK_FOUND)
+    MARK_AS_ADVANCED(
+      lapack_LIBRARY
+      )
     SET(${var} TRUE)
   ENDIF()
 ENDMACRO()
index 20b7b66f60ba93b91ef91c1065558c1a94198f05..87b465e6a1ba3a4c7b4808ab78a143b6283c52c8 100644 (file)
@@ -76,7 +76,7 @@ ENDMACRO()
 MACRO(SET_CACHED_OPTION str value)
   SET(${str}
     ${value}
-    CACHE STRING
+    CACHE BOOL
     "Automatically set due to DEAL_II_FEATURE_AUTODETECTION"
     FORCE)
 ENDMACRO()
index de51817857a62a209ced3195f1e2aeade5fb3425..168a347c92540da4e9fe960689c5787509a03f61 100644 (file)
@@ -63,6 +63,19 @@ IF(DEAL_II_COMPONENT_COMPAT_FILES)
     ${DEAL_II_INCLUDE_DIRS}
     )
 
+
+  #
+  # Add an rpath directive so that libraries outside of the default search
+  # directories will be found by the runtime dynamic linker:
+  #
+  FOREACH(lib ${DEAL_II_EXTERNAL_LIBRARIES} ${DEAL_II_LIBRARIES})
+    GET_FILENAME_COMPONENT(path ${lib} PATH)
+    LIST(APPEND MAKEFILE_LDFLAGS "-Wl,-rpath  -Wl,${path}")
+  ENDFOREACH()
+  LIST(REMOVE_DUPLICATES MAKEFILE_LDFLAGS)
+  TO_STRING(MAKEFILE_LDFLAGS ${MAKEFILE_LDFLAGS})
+  SET(MAKEFILE_LDFLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${MAKEFILE_LDFLAGS}")
+
   CONFIGURE_FILE(
     ${CMAKE_CURRENT_SOURCE_DIR}/Make.global_options.in
     ${CMAKE_CURRENT_BINARY_DIR}/Make.global_options.${CMAKE_BUILD_TYPE}
index c03acbac8e0b8a2cbb016bb6b4b9f2a2d9c676fd..2520ffbb372730c568f4a3fb7c7f8bb655d179ae 100644 (file)
@@ -29,7 +29,7 @@ CC-ID                = @CMAKE_C_COMPILER_ID@
 CC-VERSION           = @CMAKE_C_COMPILER_VERSION@
 AR                   = @CMAKE_AR@
 RANLIB               = @CMAKE_RANLIB@
-LDFLAGS              = @CMAKE_SHARED_LINKER_FLAGS@
+LDFLAGS              = @MAKEFILE_LDFLAGS@
 
 #LIBS                 = @LIBS@ # TODO
 

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.