From: Matthias Maier <tamiko@kyomu.43-1.org>
Date: Mon, 15 Sep 2014 09:53:33 +0000 (+0200)
Subject: Bugfix: Only include ./bundled/setup_bundled.cmake
X-Git-Tag: v8.2.0-rc1~151^2
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bbe720af8059c3165904dcdee60123910b5279bf;p=dealii.git

Bugfix: Only include ./bundled/setup_bundled.cmake

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
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 53308f7261..cd151aed83 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -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()
 
 #