]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Write deal_ii_external_libraries in uppercase
authormaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Fri, 21 Sep 2012 10:21:18 +0000 (10:21 +0000)
committermaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Fri, 21 Sep 2012 10:21:18 +0000 (10:21 +0000)
git-svn-id: https://svn.dealii.org/branches/branch_cmake@26586 0785d39b-7218-0410-832d-ea1e28bc413d

14 files changed:
deal.II/CMakeLists.txt
deal.II/contrib/cmake/configure/configure_1_mpi.cmake
deal.II/contrib/cmake/configure/configure_1_tbb.cmake
deal.II/contrib/cmake/configure/configure_arpack.cmake
deal.II/contrib/cmake/configure/configure_blas.cmake
deal.II/contrib/cmake/configure/configure_boost.cmake
deal.II/contrib/cmake/configure/configure_lapack.cmake
deal.II/contrib/cmake/configure/configure_metis.cmake
deal.II/contrib/cmake/configure/configure_netcdf.cmake
deal.II/contrib/cmake/configure/configure_p4est.cmake
deal.II/contrib/cmake/configure/configure_trilinos.cmake
deal.II/contrib/cmake/configure/configure_umfpack.cmake
deal.II/contrib/cmake/configure/configure_zlib.cmake
deal.II/scripts/CMakeLists.txt

index 137bc1bded524958dbc93d098dbb33cce1aa2049..714a682084daf92d0e7efc2cf12e94051e396217 100644 (file)
@@ -283,9 +283,9 @@ INCLUDE(setup_deal_ii)
 INCLUDE(setup_compiler_flags)
 
 
-#                       ####################
-#                       #     FAT NOTE:    #
-#                       ####################
+###########################################################################
+#
+#                             FAT NOTE:
 #
 # To keep things clean, only the following cmake variables should be
 # altered in the platform checks and features configuration
@@ -300,14 +300,14 @@ INCLUDE(setup_compiler_flags)
 #         for setting necessary compiler flags, e.g. -std=c++11 (if
 #         available).
 #
-      ADD_CUSTOM_TARGET(deal_ii_target_dependencies)
+ADD_CUSTOM_TARGET(deal_ii_target_dependencies)
 #         Used as a dummy target for all the stuff that has to be done
 #         before the library can be compiled.
 #
 #
 # For internal and external use:
 #
-      SET(deal_ii_external_libraries)
+SET(  DEAL_II_EXTERNAL_LIBRARIES)
 #         Used to keep track of external libraries, the deal.II library and
 #         user programs have to be linked against.
 #
@@ -318,6 +318,7 @@ INCLUDE(setup_compiler_flags)
 #         Used to keep track of external include dirs, necessary for the
 #         compilation of user programs.
 #
+###########################################################################
 
 
 #
index 0f7f165c3762ea5964816e4f0c9fad1f7232323c..2ec0c64d68d6fa5029e19c46dce1442b4f2e42bc 100644 (file)
@@ -16,7 +16,7 @@ MACRO(FEATURE_MPI_CONFIGURE_EXTERNAL var)
   INCLUDE_DIRECTORIES(${MPI_CXX_INCLUDE_PATH})
   ADD_FLAGS(CMAKE_CXX_FLAGS "${MPI_CXX_COMPILE_FLAGS}")
   ADD_FLAGS(CMAKE_SHARED_LINKER_FLAGS "${MPI_CXX_LINK_FLAGS}")
-  LIST(APPEND deal_ii_external_libraries ${MPI_CXX_LIBRARIES})
+  LIST(APPEND DEAL_II_EXTERNAL_LIBRARIES ${MPI_CXX_LIBRARIES})
 
   SET(DEAL_II_COMPILER_SUPPORTS_MPI TRUE)
 
index 0f8c80f89ae37d151c5b79cca577964117df59e0..9baded21fbd147a4499552ee276a356df6f8bccd 100644 (file)
@@ -95,17 +95,17 @@ MACRO(FEATURE_TBB_CONFIGURE_EXTERNAL var)
 
   IF (CMAKE_BUILD_TYPE MATCHES "Debug")
     IF(TBB_DEBUG_FOUND)
-      LIST(APPEND deal_ii_external_libraries ${TBB_DEBUG_LIBRARY})
+      LIST(APPEND DEAL_II_EXTERNAL_LIBRARIES ${TBB_DEBUG_LIBRARY})
     ELSE()
       MESSAGE(WARNING "\n"
         "deal.II was configured with CMAKE_BUILD_TYPE=Debug but no debug tbb\n"
         "library was found. The regular tbb library will be used instead.\n\n"
         )
-      LIST(APPEND deal_ii_external_libraries ${TBB_LIBRARY})
+      LIST(APPEND DEAL_II_EXTERNAL_LIBRARIES ${TBB_LIBRARY})
     ENDIF()
 
   ELSE()
-    LIST(APPEND deal_ii_external_libraries ${TBB_LIBRARY})
+    LIST(APPEND DEAL_II_EXTERNAL_LIBRARIES ${TBB_LIBRARY})
   ENDIF()
 
   # Setup threading and if successfull return TRUE:
index b08baa0455f9ff29c51d3af39f37e63beb990700..537d83bc9b71ae8e4a648f472a02ec0bd42d969b 100644 (file)
@@ -13,7 +13,7 @@ ENDMACRO()
 
 MACRO(FEATURE_ARPACK_CONFIGURE_EXTERNAL var)
   INCLUDE_DIRECTORIES(${ARPACK_INCLUDE_DIR})
-  LIST(APPEND deal_ii_external_libraries ${ARPACK_LIBRARY})
+  LIST(APPEND DEAL_II_EXTERNAL_LIBRARIES ${ARPACK_LIBRARY})
 
   SET(DEAL_II_USE_ARPACK TRUE)
 
index 395d1dfaf7257423087b4262fc555fefbcc9ca69..31374c3c00fc42619e4e0be7cd485d3e9465f3b3 100644 (file)
@@ -14,7 +14,7 @@ ENDMACRO()
 MACRO(FEATURE_BLAS_CONFIGURE_EXTERNAL var)
   ADD_FLAGS(CMAKE_SHARED_LINKER_FLAGS "${BLAS_LINKER_FLAGS}")
 
-  LIST(APPEND deal_ii_external_libraries
+  LIST(APPEND DEAL_II_EXTERNAL_LIBRARIES
     ${BLAS_LIBRARIES}
     )
 
index a5f2ae7e9a9073169b45a6a4ac268e40d4a2bce2..1c8e8f38813d4865407091a22223a27c56e6e79d 100644 (file)
@@ -33,11 +33,11 @@ MACRO(FEATURE_BOOST_CONFIGURE_EXTERNAL var)
   INCLUDE_DIRECTORIES (${Boost_INCLUDE_DIR})
 
   IF (CMAKE_BUILD_TYPE MATCHES "Debug")
-    LIST(APPEND deal_ii_external_libraries
+    LIST(APPEND DEAL_II_EXTERNAL_LIBRARIES
       ${Boost_THREAD_LIBRARY_DEBUG} ${Boost_SERIALIZATION_LIBRARY_DEBUG}
       )
   ELSE()
-    LIST(APPEND deal_ii_external_libraries
+    LIST(APPEND DEAL_II_EXTERNAL_LIBRARIES
       ${Boost_THREAD_LIBRARY} ${Boost_SERIALIZATION_LIBRARY}
       )
   ENDIF()
index 10e8c00616fd7ebba8c443c4c7090682bf13b2b3..3c75f872ec12c4e2e968b07440da180dc695c79f 100644 (file)
@@ -15,7 +15,7 @@ MACRO(FEATURE_LAPACK_CONFIGURE_EXTERNAL var)
 
   ADD_FLAGS(CMAKE_SHARED_LINKER_FLAGS "${LAPACK_LINKER_FLAGS}")
 
-  LIST(APPEND deal_ii_external_libraries
+  LIST(APPEND DEAL_II_EXTERNAL_LIBRARIES
     ${LAPACK_LIBRARIES}
     )
 
index e05b34fe8d6f9ad6f1be25d02cd8e0226c6cdafe..a813cf1164cb5da1308373b7ac52c72e8cb6440b 100644 (file)
@@ -18,7 +18,7 @@ ENDMACRO()
 
 MACRO(FEATURE_METIS_CONFIGURE_EXTERNAL var)
   INCLUDE_DIRECTORIES(${METIS_INCLUDE_DIR})
-  LIST(APPEND deal_ii_external_libraries ${METIS_LIBRARY})
+  LIST(APPEND DEAL_II_EXTERNAL_LIBRARIES ${METIS_LIBRARY})
 
   SET(DEAL_II_USE_METIS TRUE)
 
index 4aa284fc05187a7a842bc0b5b6566ec2bc1c8129..6dcc526064bbec450e7d60324d350a891b955714 100644 (file)
@@ -13,7 +13,7 @@ ENDMACRO()
 
 MACRO(FEATURE_NETCDF_CONFIGURE_EXTERNAL var)
   INCLUDE_DIRECTORIES(${NETCDF_INCLUDE_DIR})
-  LIST(APPEND deal_ii_external_libraries ${NETCDF_LIBRARY})
+  LIST(APPEND DEAL_II_EXTERNAL_LIBRARIES ${NETCDF_LIBRARY})
   SET(HAVE_LIBNETCDF TRUE)
 
   SET(${var} TRUE)
index d296c28ff1f38fc435cea2b819e092b5c74131e6..471e8e4b9f38d2ec524ea095c78d16c664b266fd 100644 (file)
@@ -48,7 +48,7 @@ MACRO(FEATURE_P4EST_CONFIGURE_EXTERNAL var)
 
   IF (CMAKE_BUILD_TYPE MATCHES "Debug")
     IF(P4EST_DEBUG_FOUND AND SC_DEBUG_FOUND)
-      LIST(APPEND deal_ii_external_libraries
+      LIST(APPEND DEAL_II_EXTERNAL_LIBRARIES
         ${P4EST_DEBUG_LIBRARY} ${SC_DEBUG_LIBRARY}
         )
     ELSE()
@@ -57,12 +57,12 @@ MACRO(FEATURE_P4EST_CONFIGURE_EXTERNAL var)
         "sc libraries were found. The regular p4est and sc libraries will be used\n"
         "instead.\n\n"
         )
-      LIST(APPEND deal_ii_external_libraries
+      LIST(APPEND DEAL_II_EXTERNAL_LIBRARIES
         ${P4EST_LIBRARY} ${SC_LIBRARY}
         )
     ENDIF()
   ELSE()
-    LIST(APPEND deal_ii_external_libraries
+    LIST(APPEND DEAL_II_EXTERNAL_LIBRARIES
       ${P4EST_LIBRARY} ${SC_LIBRARY}
       )
   ENDIF()
index ea8d0239bd6ba1599530692590b21fd97b330d84..bd710f492b5e9ed3f3c11725fa941f7b4409d8cb 100644 (file)
@@ -144,7 +144,7 @@ ENDMACRO()
 MACRO(FEATURE_TRILINOS_CONFIGURE_EXTERNAL var)
   INCLUDE_DIRECTORIES(${TRILINOS_INCLUDE_DIR})
 
-  LIST(APPEND deal_ii_external_libraries
+  LIST(APPEND DEAL_II_EXTERNAL_LIBRARIES
     ${TRILINOS_LIBRARIES}
     ${Trilinos_TPL_LIBRARIES}
     )
index 34b8ee1df4f40dccd65611f45a7f8ac8ee5307bf..563ca126815bbd5e22a7d4acae44fe0f5e621406 100644 (file)
@@ -22,7 +22,7 @@ ENDMACRO()
 MACRO(FEATURE_UMFPACK_CONFIGURE_EXTERNAL var)
   INCLUDE_DIRECTORIES(${UMFPACK_INCLUDE_DIR} ${AMD_INCLUDE_DIR})
 
-  LIST(APPEND deal_ii_external_libraries
+  LIST(APPEND DEAL_II_EXTERNAL_LIBRARIES
     ${UMFPACK_LIBRARY} ${AMD_LIBRARY}
     )
 
index 1221050628a75758e6f07ee6c33d6fc8fa09693b..f0e4f3f81b1f2156afb91bb55f248c1f6e6c367d 100644 (file)
@@ -13,7 +13,7 @@ ENDMACRO()
 
 MACRO(FEATURE_ZLIB_CONFIGURE_EXTERNAL var)
   INCLUDE_DIRECTORIES(${ZLIB_INCLUDE_DIRS})
-  LIST(APPEND deal_ii_external_libraries ${ZLIB_LIBRARIES})
+  LIST(APPEND DEAL_II_EXTERNAL_LIBRARIES ${ZLIB_LIBRARIES})
   SET(HAVE_LIBZ TRUE)
 
   SET(${var} TRUE)
index d504ca9d75575a67390a26a525da1073204e9736..213228092d23c99c12ae7d5e9311dfc17474a484 100644 (file)
@@ -12,7 +12,7 @@ IF(DEAL_II_INSTALL_COMPAT_FILES)
   ADD_EXECUTABLE(make_dependencies make_dependencies.cc)
 
   ADD_EXECUTABLE(report_features report_features.cc)
-  TARGET_LINK_LIBRARIES(report_features ${deal_ii_external_libraries})
+  TARGET_LINK_LIBRARIES(report_features ${DEAL_II_EXTERNAL_LIBRARIES})
 
   ADD_DEPENDENCIES(report_features deal_ii_target_dependencies)
 

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.