]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Bugfix
authormaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Fri, 21 Sep 2012 20:24:55 +0000 (20:24 +0000)
committermaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Fri, 21 Sep 2012 20:24:55 +0000 (20:24 +0000)
git-svn-id: https://svn.dealii.org/branches/branch_cmake@26612 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/cmake/setup_custom_targets.cmake
deal.II/source/CMakeLists.txt

index 8c48e19911df2a0cf596694357d06686ae729d58..d4f81e7e8f62a25d7056b180777541116774478e 100644 (file)
@@ -10,7 +10,7 @@
 #
 
 ADD_CUSTOM_TARGET(library)
-ADD_DEPENDENCIES(library deal_II)
+ADD_DEPENDENCIES(library ${DEAL_II_BASE_NAME})
 
 
 IF(DEAL_II_COMPONENT_DOCUMENTATION)
index ae637ee23c2c7def11426b481225144c920fcf16..66c8fb3322fc498367bf1b832bb19853505b397d 100644 (file)
@@ -23,7 +23,7 @@ ADD_SUBDIRECTORY(numerics)
 #
 # Combine all OBJECT targets to a library:
 #
-ADD_LIBRARY(deal_II
+ADD_LIBRARY(${DEAL_II_BASE_NAME}
   $<TARGET_OBJECTS:obj_base>
   $<TARGET_OBJECTS:obj_distributed>
   $<TARGET_OBJECTS:obj_dofs>
@@ -48,17 +48,17 @@ SET_TARGET_PROPERTIES(${DEAL_II_BASE_NAME} PROPERTIES
   SOVERSION ${VERSION}
   )
 
-SET_TARGET_PROPERTIES(deal_II PROPERTIES
+SET_TARGET_PROPERTIES(${DEAL_II_BASE_NAME} PROPERTIES
   LINK_FLAGS "${deal_ii_required_linker_flags}"
   )
 
-TARGET_LINK_LIBRARIES(deal_II ${DEAL_II_EXTERNAL_LIBRARIES})
+TARGET_LINK_LIBRARIES(${DEAL_II_BASE_NAME} ${DEAL_II_EXTERNAL_LIBRARIES})
 
 
 #
 # Finally, add a rule how to install the library:
 #
-INSTALL(TARGETS deal_II
+INSTALL(TARGETS ${DEAL_II_BASE_NAME}
   LIBRARY
   DESTINATION ${DEAL_II_LIBRARY_RELDIR}
   COMPONENT library

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.