From: maier Date: Sat, 13 Jul 2013 12:39:04 +0000 (+0000) Subject: CMake: Update documentation X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=24246a81937107fc35d1ea019cf2929721d54755;p=dealii-svn.git CMake: Update documentation git-svn-id: https://svn.dealii.org/trunk@29994 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/doc/development/Config.sample b/deal.II/doc/development/Config.sample index 07ce4312b1..61716f2d5f 100644 --- a/deal.II/doc/development/Config.sample +++ b/deal.II/doc/development/Config.sample @@ -107,13 +107,16 @@ # "The user supplied cache variable will be appended _at the end_ of the auto generated DEAL_II_LINKER_FLAGS_RELEASE variable" # ) # -# OPTION(DEAL_II_STATIC_EXECUTABLE "ON" CACHE BOOL -# "Provide a link interface that is suitable for static linkage of executables. Enabling this option forces BUILD_SHARED_LIBS=OFF" +# SET(BUILD_SHARED_LIBS "ON" CACHE BOOL +# "Build a shared library" # ) # +# SET(DEAL_II_PREFER_STATIC_LIBS "OFF" CACHE BOOL +# "Prefer static libraries over dynamic libraries when searching for features and corresponding link interface" +# ) # -# SET(BUILD_SHARED_LIBS "ON" CACHE BOOL -# "Build a shared library" +# OPTION(DEAL_II_STATIC_EXECUTABLE "OFF" CACHE BOOL +# "Provide a link interface that is suitable for static linkage of executables. Enabling this option forces BUILD_SHARED_LIBS=OFF and DEAL_II_PREFER_STATIC_LIBS=ON" # ) # # SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH "ON" CACHE BOOL