]> https://gitweb.dealii.org/ - dealii.git/commitdiff
Bugfix: Only include ./bundled/setup_bundled.cmake 148/head
authorMatthias Maier <tamiko@kyomu.43-1.org>
Mon, 15 Sep 2014 09:53:33 +0000 (11:53 +0200)
committerMatthias Maier <tamiko@kyomu.43-1.org>
Mon, 15 Sep 2014 09:56:41 +0000 (11:56 +0200)
Remove a stray globbing expression that is not necessary any more and that
indeed leads to a subtle issue when configuring in-source with
  $ cmake .

In this case ./bundled/cmake_install.cmake was accidentally picked up
leading to a file permission error if CMAKE_INSTALL_PREFIX was left at the
default /usr/local

CMakeLists.txt

index 53308f72618174bcef0c05d9fea79b7cb77e9771..cd151aed834379a30806e91fb20cfeb9985eb692 100644 (file)
@@ -1,7 +1,7 @@
 ## ---------------------------------------------------------------------
 ## $Id$
 ##
-## Copyright (C) 2012 - 2013 by the deal.II authors
+## Copyright (C) 2012 - 2014 by the deal.II authors
 ##
 ## This file is part of the deal.II library.
 ##
@@ -95,13 +95,10 @@ INCLUDE(setup_compiler_flags)
 # Include information about bundled libraries:
 #
 IF(DEAL_II_HAVE_BUNDLED_DIRECTORY)
-  FILE(GLOB _check_files "bundled/*.cmake")
-  LIST(SORT _check_files)
-  FOREACH(_file ${_check_files})
-    MESSAGE(STATUS "")
-    MESSAGE(STATUS "Include ${_file}")
-    INCLUDE(${_file})
-  ENDFOREACH()
+  SET(_file ${CMAKE_SOURCE_DIR}/bundled/setup_bundled.cmake)
+  MESSAGE(STATUS "")
+  MESSAGE(STATUS "Include ${_file}")
+  INCLUDE(${_file})
 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.