[asterisk-scf-commits] asterisk-scf/integration/gitall.git branch "master" updated.

[Commits to the Asterisk SCF project code repositories]

branch "master" has been updated
       via  a3271cd8dd6a62c34e48138b4af04705c3b9b042 (commit)
      from  50e3ad324c1d94e5bfb7d2f7215c4d708b4a4c27 (commit)

Summary of changes:
 CMakeLists.txt |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)


- Log -----------------------------------------------------------------
commit a3271cd8dd6a62c34e48138b4af04705c3b9b042
Author: Kevin P. Fleming <kpfleming at digium.com>
Date:   Thu Jun 23 14:26:09 2011 -0500

    Enable CMP0017 when CMake 2.8.4 or later are used.
    
    CMake 2.8.4 introduced new behavior for when a CMake script uses include()
    or find_package() to bring in a module that exists *both* in the standard
    CMake library and in CMAKE_MODULE_PATH; this affects our build because we
    distribute some modules from later versions of CMake so that users of earlier
    versions will be able to use them when building Asterisk SCF. Since we'd prefer
    to use the one included with CMake if there is one, this patch enables
    the 2.8.4 behavior when CMake 2.8.4 (or later) is in use.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ada6a5f..864914f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,6 +3,13 @@
 # Minimum we require is 2.8, any lower and stuff would fail horribly
 cmake_minimum_required(VERSION 2.8)
 
+# CMake 2.8.4 introduced a new policy for handling included files (CMP0017).
+# These build scripts are OK with the NEW behavior (and it is preferred), so
+# if that behavior is available, we'll enable it here.
+if(CMAKE_VERSION VERSION_GREATER 2.8.3)
+  cmake_policy(VERSION 2.8.4)
+endif()
+
 # Setup overall project.  While primarily C++, C is required to find some
 # packages (such as Threads).
 project("Asterisk SCF" C CXX)

-----------------------------------------------------------------------


-- 
asterisk-scf/integration/gitall.git