]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Small Bugfix
authormaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Mon, 24 Sep 2012 19:51:03 +0000 (19:51 +0000)
committermaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Mon, 24 Sep 2012 19:51:03 +0000 (19:51 +0000)
git-svn-id: https://svn.dealii.org/branches/branch_cmake@26685 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/cmake/setup_deal_ii.cmake

index b24210b33a20ba09621ca9d57fa97090e317daf3..3748b3a6c798c9db3c0364d1a50699b5dc787caa 100644 (file)
@@ -55,9 +55,8 @@ LIST(APPEND DEAL_II_INCLUDE_DIRS
   "${CMAKE_INSTALL_PREFIX}/${DEAL_II_INCLUDE_RELDIR}"
   )
 
-
 #
-# The library name:
+# A lot of magic to guess the resulting library names:
 #
 
 IF(BUILD_SHARED_LIBS)
@@ -68,17 +67,23 @@ ELSE()
   SET(DEAL_II_LIBRARY_NAME_DEBUG ${CMAKE_STATIC_LIBRARY_PREFIX}${DEAL_II_BASE_NAME}${DEAL_II_DEBUG_SUFFIX}${CMAKE_STATIC_LIBRARY_SUFFIX} )
 ENDIF()
 
-LIST(APPEND DEAL_II_LIBRARIES_DEBUG
-  "${CMAKE_INSTALL_PREFIX}/${DEAL_II_LIBRARY_RELDIR}/${DEAL_II_LIBRARY_NAME_DEBUG}"
-  )
-LIST(APPEND DEAL_II_LIBRARIES_RELEASE
-  "${CMAKE_INSTALL_PREFIX}/${DEAL_II_LIBRARY_RELDIR}/${DEAL_II_LIBRARY_NAME_RELEASE}"
-  )
+IF(CMAKE_BUILD_TYPE MATCHES "Debug")
+  LIST(APPEND DEAL_II_LIBRARIES_DEBUG
+    "${CMAKE_INSTALL_PREFIX}/${DEAL_II_LIBRARY_RELDIR}/${DEAL_II_LIBRARY_NAME_DEBUG}"
+    )
+  LIST(APPEND DEAL_II_LIBRARIES
+    DEBUG
+    "${CMAKE_INSTALL_PREFIX}/${DEAL_II_LIBRARY_RELDIR}/${DEAL_II_LIBRARY_NAME_DEBUG}"
+    )
+ENDIF()
 
-LIST(APPEND DEAL_II_LIBRARIES
-  DEBUG
-  "${CMAKE_INSTALL_PREFIX}/${DEAL_II_LIBRARY_RELDIR}/${DEAL_II_LIBRARY_NAME_DEBUG}"
-  RELEASE
-  "${CMAKE_INSTALL_PREFIX}/${DEAL_II_LIBRARY_RELDIR}/${DEAL_II_LIBRARY_NAME_RELEASE}"
-  )
+IF(CMAKE_BUILD_TYPE MATCHES "Release")
+  LIST(APPEND DEAL_II_LIBRARIES_RELEASE
+    "${CMAKE_INSTALL_PREFIX}/${DEAL_II_LIBRARY_RELDIR}/${DEAL_II_LIBRARY_NAME_RELEASE}"
+    )
+  LIST(APPEND DEAL_II_LIBRARIES
+    RELEASE
+    "${CMAKE_INSTALL_PREFIX}/${DEAL_II_LIBRARY_RELDIR}/${DEAL_II_LIBRARY_NAME_RELEASE}"
+    )
+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.