]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Bugfix
authormaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Fri, 5 Oct 2012 16:01:57 +0000 (16:01 +0000)
committermaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Fri, 5 Oct 2012 16:01:57 +0000 (16:01 +0000)
git-svn-id: https://svn.dealii.org/branches/branch_cmake@26969 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/CMakeLists.txt
deal.II/config/CMakeLists.txt
deal.II/config/setup_make.global_options.cmake [new file with mode: 0644]
deal.II/source/CMakeLists.txt

index 50b3423c1cce2345e5bdc7caca62bfcab3ad5d1f..145bcfea2775623643400350f8a67e81a163bb52 100644 (file)
@@ -139,6 +139,10 @@ IF(DEAL_II_WITH_DOC_DIRECTORY)
 ENDIF()
 ADD_SUBDIRECTORY(examples)
 ADD_SUBDIRECTORY(contrib)
+IF(DEAL_II_COMPONENT_COMPAT_FILES)
+  INCLUDE(config/setup_make.global_options.cmake)
+ENDIF()
+
 
 #
 # Define some custom targets for convenience
index 5382bbd59a7740759e5f7f571827cdaaa12994a6..d8d73562b9c347abe954389ecf41a8e4bd979bfc 100644 (file)
@@ -100,94 +100,3 @@ INSTALL(FILES
   COMPONENT library
   )
 
-
-###########################################################################
-#                                                                         #
-#          Configure and install the old Makefile configuration:          #
-#                                                                         #
-###########################################################################
-
-IF(DEAL_II_COMPONENT_COMPAT_FILES)
-
-  #
-  # Transform some cmake lists into a string that the old Makefile
-  # mechanism actually understands:
-  #
-  TO_STRING_AND_ADD_PREFIX(MAKEFILE_INCLUDE_DIRS "${CMAKE_INCLUDE_FLAG_C}"
-    ${DEAL_II_USER_INCLUDE_DIRS}
-    ${DEAL_II_INCLUDE_DIRS}
-    )
-
-  FOREACH(build ${DEAL_II_BUILD_TYPES})
-    TO_STRING_AND_ADD_PREFIX(MAKEFILE_DEFINITIONS_${build}
-      "-D"
-      ${DEAL_II_USER_DEFINITIONS}
-      ${DEAL_II_USER_DEFINITIONS_${build}}
-      )
-
-    #
-    # Add an rpath directive in front of each library, so that libraries
-    # outside of the default search directories will be found by the runtime
-    # dynamic linker:
-    #
-    FOREACH(lib
-        ${DEAL_II_EXTERNAL_LIBRARIES}
-        ${DEAL_II_EXTERNAL_LIBRARIES_${build}}
-        ${DEAL_II_LIBRARIES_${build}})
-      GET_FILENAME_COMPONENT(path ${lib} PATH)
-      LIST(APPEND MAKEFILE_LIBS_${build} "-Wl,-rpath -Wl,${path}")
-      LIST(APPEND MAKEFILE_LIBS_${build} ${lib})
-    ENDFOREACH()
-    TO_STRING(MAKEFILE_LIBS_${build} ${MAKEFILE_LIBS_${build}})
-    #
-    # Put our linker flags directly in front of this string:
-    #
-    SET(MAKEFILE_LIBS_${build}
-      "${CMAKE_SHARED_LINKER_FLAGS} ${DEAL_II_SHARED_LINKER_FLAGS_${build}} ${MAKEFILE_LIBS_${build}}"
-      )
-  ENDFOREACH()
-
-  #
-  # Boilerplate: The Make.global_options expects variables to be set to
-  # yes, as is common for Makefiles.
-  #
-  COND_SET_TO_YES(DEAL_II_WITH_TBB MAKEFILE_enablethreads)
-  COND_SET_TO_YES(DEAL_II_WITH_FUNCTIONPARSER MAKEFILE_enableparser)
-  COND_SET_TO_YES(BUILD_SHARED_LIBS MAKEFILE_enableshared)
-
-  COND_SET_TO_YES(DEAL_II_WITH_PETSC MAKEFILE_PETSC)
-  COND_SET_TO_YES(DEAL_II_USE_PETSC_DEV MAKEFILE_PETSC_DEV)
-  COND_SET_TO_YES(DEAL_II_WITH_TRILINOS MAKEFILE_TRILINOS)
-  COND_SET_TO_YES(DEAL_II_WITH_BLAS MAKEFILE_BLAS)
-  COND_SET_TO_YES(DEAL_II_WITH_LAPACK MAKEFILE_LAPACK)
-  COND_SET_TO_YES(DEAL_II_WITH_ARPACK MAKEFILE_ARPACK)
-  COND_SET_TO_YES(DEAL_II_WITH_METIS MAKEFILE_METIS)
-  COND_SET_TO_YES(DEAL_II_WITH_UMFPACK MAKEFILE_UMFPACK)
-  COND_SET_TO_YES(DEAL_II_WITH_P4EST MAKEFILE_P4EST)
-  COND_SET_TO_YES(DEAL_II_WITH_MPI MAKEFILE_MPI)
-
-  CONFIGURE_FILE(
-    ${CMAKE_CURRENT_SOURCE_DIR}/Make.global_options.in
-    ${CMAKE_CURRENT_BINARY_DIR}/Make.global_options
-    )
-
-  CONFIGURE_FILE(
-    ${CMAKE_CURRENT_SOURCE_DIR}/Version.in
-    ${CMAKE_CURRENT_BINARY_DIR}/Version
-    )
-
-  INSTALL(FILES
-    ${CMAKE_CURRENT_BINARY_DIR}/template-arguments
-    ${CMAKE_CURRENT_BINARY_DIR}/Make.global_options
-    DESTINATION common
-    COMPONENT compat_files
-    )
-
-  INSTALL(FILES
-    ${CMAKE_CURRENT_BINARY_DIR}/Version
-    DESTINATION ${CMAKE_INSTALL_PREFIX}
-    COMPONENT compat_files
-    )
-
-ENDIF()
-
diff --git a/deal.II/config/setup_make.global_options.cmake b/deal.II/config/setup_make.global_options.cmake
new file mode 100644 (file)
index 0000000..986cd63
--- /dev/null
@@ -0,0 +1,102 @@
+#####
+##
+## Copyright (C) 2012 by the deal.II authors
+##
+## This file is part of the deal.II library.
+##
+## <TODO: Full License information>
+## This file is dual licensed under QPL 1.0 and LGPL 2.1 or any later
+## version of the LGPL license.
+##
+## Author: Matthias Maier <matthias.maier@iwr.uni-heidelberg.de>
+##
+#####
+
+
+###########################################################################
+#                                                                         #
+#          Configure and install the old Makefile configuration:          #
+#                                                                         #
+###########################################################################
+
+#
+# Transform some cmake lists into a string that the old Makefile
+# mechanism actually understands:
+#
+TO_STRING_AND_ADD_PREFIX(MAKEFILE_INCLUDE_DIRS "${CMAKE_INCLUDE_FLAG_C}"
+  ${DEAL_II_USER_INCLUDE_DIRS}
+  ${DEAL_II_INCLUDE_DIRS}
+  )
+
+FOREACH(build ${DEAL_II_BUILD_TYPES})
+  TO_STRING_AND_ADD_PREFIX(MAKEFILE_DEFINITIONS_${build}
+    "-D"
+    ${DEAL_II_USER_DEFINITIONS}
+    ${DEAL_II_USER_DEFINITIONS_${build}}
+    )
+
+  #
+  # Add an rpath directive in front of each library, so that libraries
+  # outside of the default search directories will be found by the runtime
+  # dynamic linker:
+  #
+  FOREACH(lib
+      ${MAKEFILE_LIBRARY_${build}}
+      ${DEAL_II_EXTERNAL_LIBRARIES}
+      ${DEAL_II_EXTERNAL_LIBRARIES_${build}}
+      )
+    GET_FILENAME_COMPONENT(path ${lib} PATH)
+    LIST(APPEND MAKEFILE_LIBS_${build} "-Wl,-rpath -Wl,${path}")
+    LIST(APPEND MAKEFILE_LIBS_${build} ${lib})
+  ENDFOREACH()
+  TO_STRING(MAKEFILE_LIBS_${build} ${MAKEFILE_LIBS_${build}})
+  #
+  # Put our linker flags directly in front of this string:
+  #
+  SET(MAKEFILE_LIBS_${build}
+    "${CMAKE_SHARED_LINKER_FLAGS} ${DEAL_II_SHARED_LINKER_FLAGS_${build}} ${MAKEFILE_LIBS_${build}}"
+    )
+ENDFOREACH()
+
+#
+# Boilerplate: The Make.global_options expects variables to be set to
+# yes, as is common for Makefiles.
+#
+COND_SET_TO_YES(DEAL_II_WITH_TBB MAKEFILE_enablethreads)
+COND_SET_TO_YES(DEAL_II_WITH_FUNCTIONPARSER MAKEFILE_enableparser)
+COND_SET_TO_YES(BUILD_SHARED_LIBS MAKEFILE_enableshared)
+
+COND_SET_TO_YES(DEAL_II_WITH_PETSC MAKEFILE_PETSC)
+COND_SET_TO_YES(DEAL_II_USE_PETSC_DEV MAKEFILE_PETSC_DEV)
+COND_SET_TO_YES(DEAL_II_WITH_TRILINOS MAKEFILE_TRILINOS)
+COND_SET_TO_YES(DEAL_II_WITH_BLAS MAKEFILE_BLAS)
+COND_SET_TO_YES(DEAL_II_WITH_LAPACK MAKEFILE_LAPACK)
+COND_SET_TO_YES(DEAL_II_WITH_ARPACK MAKEFILE_ARPACK)
+COND_SET_TO_YES(DEAL_II_WITH_METIS MAKEFILE_METIS)
+COND_SET_TO_YES(DEAL_II_WITH_UMFPACK MAKEFILE_UMFPACK)
+COND_SET_TO_YES(DEAL_II_WITH_P4EST MAKEFILE_P4EST)
+COND_SET_TO_YES(DEAL_II_WITH_MPI MAKEFILE_MPI)
+
+CONFIGURE_FILE(
+  ${CMAKE_SOURCE_DIR}/config/Make.global_options.in
+  ${CMAKE_BINARY_DIR}/config/Make.global_options
+  )
+
+CONFIGURE_FILE(
+  ${CMAKE_SOURCE_DIR}/config/Version.in
+  ${CMAKE_BINARY_DIR}/config/Version
+  )
+
+INSTALL(FILES
+  ${CMAKE_BINARY_DIR}/config/template-arguments
+  ${CMAKE_BINARY_DIR}/config/Make.global_options
+  DESTINATION common
+  COMPONENT compat_files
+  )
+
+INSTALL(FILES
+  ${CMAKE_BINARY_DIR}/config/Version
+  DESTINATION ${CMAKE_INSTALL_PREFIX}
+  COMPONENT compat_files
+  )
+
index 0c51e4148e640b8db9d96a1f824ad303ad802f06..3bdc38cc7ebd3b21694fb7c9942b73a00ebc2d06 100644 (file)
@@ -72,6 +72,13 @@ FOREACH(build ${DEAL_II_BUILD_TYPES})
     COMPONENT library
     )
 
+  #
+  # Information for legacy Make.global_options
+  #
+  GET_TARGET_PROPERTY(lib ${DEAL_II_BASE_NAME}${DEAL_II_${build}_SUFFIX} LOCATION)
+  GET_FILENAME_COMPONENT(lib "${lib}" NAME)
+  SET(MAKEFILE_LIBRARY_${build} "${CMAKE_INSTALL_PREFIX}/${DEAL_II_LIBRARY_RELDIR}/${lib}" PARENT_SCOPE)
+
 ENDFOREACH()
 
 INSTALL(EXPORT ${DEAL_II_PROJECT_CONFIG_NAME}Targets

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.