From 2caee92eb99e5714dff0eb614f639f405328d8c1 Mon Sep 17 00:00:00 2001 From: Matthias Maier Date: Fri, 15 Mar 2013 15:18:43 +0000 Subject: [PATCH] CMake: Minor documentation cleanup git-svn-id: https://svn.dealii.org/trunk@28912 0785d39b-7218-0410-832d-ea1e28bc413d --- .../{CMakeLists.txt.example => CMakeLists.txt.sample} | 2 +- deal.II/doc/development/cmakelists.html | 10 +++------- 2 files changed, 4 insertions(+), 8 deletions(-) rename deal.II/doc/development/{CMakeLists.txt.example => CMakeLists.txt.sample} (95%) diff --git a/deal.II/doc/development/CMakeLists.txt.example b/deal.II/doc/development/CMakeLists.txt.sample similarity index 95% rename from deal.II/doc/development/CMakeLists.txt.example rename to deal.II/doc/development/CMakeLists.txt.sample index 8de818e090..549cf0d0bb 100644 --- a/deal.II/doc/development/CMakeLists.txt.example +++ b/deal.II/doc/development/CMakeLists.txt.sample @@ -44,7 +44,7 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8.8) # FIND_PACKAGE(deal.II 8.0 REQUIRED HINTS - ${DEAL_II_DIRS} ../ ../../ ../../../ ../../../../../ $ENV{DEAL_II_DIR} + ${DEAL_II_DIRS} ../ ../../ $ENV{DEAL_II_DIR} # # If the deal.II library cannot be found (because it is not installed at a # default location or your project resides at an uncommon place), you diff --git a/deal.II/doc/development/cmakelists.html b/deal.II/doc/development/cmakelists.html index 163702a755..5ebc8bc15f 100644 --- a/deal.II/doc/development/cmakelists.html +++ b/deal.II/doc/development/cmakelists.html @@ -70,7 +70,7 @@

The easiest way to write a CMakeLists.txt file is to use an "autopilot" style macro. Here is an example for the step-1 - tutorial program (plain text version) that can be used for simple projects:

@@ -117,7 +117,7 @@
     #
     FIND_PACKAGE(deal.II 8.0 REQUIRED
       HINTS
-        ${DEAL_II_DIR} ../ ../../ ../../../ ../../../../../ $ENV{DEAL_II_DIR}
+        ${DEAL_II_DIR} ../ ../../ $ENV{DEAL_II_DIR}
       #
       # If the deal.II library cannot be found (because it is not installed at a
       # default location or your project resides at an uncommon place), you
@@ -199,7 +199,7 @@
     #
     FIND_PACKAGE(deal.II 8.0 REQUIRED
       HINTS
-        ${DEAL_II_DIR} ../ ../../ ../../../ ../../../../../ $ENV{DEAL_II_DIR}
+        ${DEAL_II_DIR} ../ ../../ $ENV{DEAL_II_DIR}
       #
       # If the deal.II library cannot be found (because it is not installed at a
       # default location or your project resides at an uncommon place), you
@@ -244,13 +244,9 @@
       COMMENT "Run ${TARGET} with ${CMAKE_BUILD_TYPE} configuration"
       )
       
- - Further details can be found in the deal.II CMake ReadME.

-

Advanced setup for deal.II in a CMake project

-- 2.39.5