]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Bugfix
authormaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Thu, 4 Oct 2012 14:29:59 +0000 (14:29 +0000)
committermaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Thu, 4 Oct 2012 14:29:59 +0000 (14:29 +0000)
git-svn-id: https://svn.dealii.org/branches/branch_cmake@26954 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/config/CMakeLists.txt

index a09c135935cc4bd50e264d9cb61855d5e52ef77e..a084ada0884184008fd017e2509cfe6732e57ba8 100644 (file)
@@ -37,7 +37,7 @@ INSTALL(FILES
 # Configure and install the cmake project configuration:
 #
 
-IF(NOT "${CONFIG_EXTERNAL_LIBRARIES}" STREQUAL "")
+IF(NOT "${DEAL_II_EXTERNAL_LIBRARIES}" STREQUAL "")
   SET(CONFIG_EXTERNAL_LIBRARIES
     general
     ${DEAL_II_EXTERNAL_LIBRARIES}
@@ -49,10 +49,12 @@ IF(CMAKE_BUILD_TYPE MATCHES "Debug")
     ${DEAL_II_EXTERNAL_LIBRARIES}
     ${DEAL_II_EXTERNAL_LIBRARIES_DEBUG}
     )
-  LIST(APPEND CONFIG_EXTERNAL_LIBRARIES
-    debug
-    ${DEAL_II_EXTERNAL_LIBRARIES_DEBUG}
-    )
+  IF(NOT "${DEAL_II_EXTERNAL_LIBRARIES_DEBUG}" STREQUAL "")
+    LIST(APPEND CONFIG_EXTERNAL_LIBRARIES
+      debug
+      ${DEAL_II_EXTERNAL_LIBRARIES_DEBUG}
+      )
+  ENDIF()
 ENDIF()
 
 IF(CMAKE_BUILD_TYPE MATCHES "Release")
@@ -60,10 +62,12 @@ IF(CMAKE_BUILD_TYPE MATCHES "Release")
     ${DEAL_II_EXTERNAL_LIBRARIES}
     ${DEAL_II_EXTERNAL_LIBRARIES_RELEASE}
     )
-  LIST(APPEND CONFIG_EXTERNAL_LIBRARIES
-    optimized
-    ${DEAL_II_EXTERNAL_LIBRARIES_RELEASE}
-    )
+  IF(NOT "${DEAL_II_EXTERNAL_LIBRARIES_RELEASE}" STREQUAL "")
+    LIST(APPEND CONFIG_EXTERNAL_LIBRARIES
+      optimized
+      ${DEAL_II_EXTERNAL_LIBRARIES_RELEASE}
+      )
+  ENDIF()
 ENDIF()
 
 CONFIGURE_FILE(

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.