]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Rename global variables to avoid a clash with features
authormaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Tue, 30 Oct 2012 14:09:26 +0000 (14:09 +0000)
committermaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Tue, 30 Oct 2012 14:09:26 +0000 (14:09 +0000)
git-svn-id: https://svn.dealii.org/branches/branch_cmake@27239 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/CMakeLists.txt

index 14e7d9dbf648718876baf4de342f2f059508cd3c..01ab24fa4cb8d2bbcbf9dfe7ff17fbfb8f9588e7 100644 (file)
@@ -57,11 +57,11 @@ INCLUDE(setup_external_macros)
 # Check whether the doc and bundled folders are available:
 #
 IF(EXISTS ${CMAKE_SOURCE_DIR}/bundled/CMakeLists.txt)
-  SET(DEAL_II_WITH_BUNDLED_DIRECTORY TRUE)
+  SET(DEAL_II_HAVE_BUNDLED_DIRECTORY TRUE)
 ENDIF()
 
 IF(EXISTS ${CMAKE_SOURCE_DIR}/doc/CMakeLists.txt)
-  SET(DEAL_II_WITH_DOC_DIRECTORY TRUE)
+  SET(DEAL_II_HAVE_DOC_DIRECTORY TRUE)
 ENDIF()
 
 #
@@ -89,7 +89,7 @@ ENDFOREACH()
 #
 # Include information about bundled libraries:
 #
-IF(DEAL_II_WITH_BUNDLED_DIRECTORY)
+IF(DEAL_II_HAVE_BUNDLED_DIRECTORY)
   INCLUDE(bundled/CMakeLists.txt)
 ENDIF()
 
@@ -121,7 +121,7 @@ ADD_SUBDIRECTORY(scripts)
 
 ADD_SUBDIRECTORY(include)
 
-IF(DEAL_II_WITH_BUNDLED_DIRECTORY)
+IF(DEAL_II_HAVE_BUNDLED_DIRECTORY)
   ADD_SUBDIRECTORY(bundled)
 ENDIF()
 
@@ -131,7 +131,7 @@ ADD_SUBDIRECTORY(config) # has to be included after source
 
 ADD_SUBDIRECTORY(contrib) # has to be included after source
 
-IF(DEAL_II_WITH_DOC_DIRECTORY)
+IF(DEAL_II_HAVE_DOC_DIRECTORY)
   ADD_SUBDIRECTORY(doc)
 ENDIF()
 

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.