[asterisk-scf-commits] asterisk-scf/release/cmake.git branch "master" updated.

[Commits to the Asterisk SCF project code repositories]

branch "master" has been updated
       via  df826410d0af5601c3bd344db5cfa22b66d72ef1 (commit)
       via  6acd2b964fc48a19a4c1a5817bf1af10c617696c (commit)
      from  9686f69b915134654f2c0d2c9dc4168dc8ef3fe1 (commit)

Summary of changes:
 AsteriskSCF.cmake      |    6 ++++--
 example/CMakeLists.txt |    4 ++--
 2 files changed, 6 insertions(+), 4 deletions(-)


- Log -----------------------------------------------------------------
commit df826410d0af5601c3bd344db5cfa22b66d72ef1
Author: David M. Lee <dlee at digium.com>
Date:   Wed Jan 19 12:18:10 2011 -0600

    We require cmake 2.8 or better.
    
    Now make it a specific "You're cmake is old" failure, as opposed to some
    random failure later on.

diff --git a/example/CMakeLists.txt b/example/CMakeLists.txt
index 5e09015..3deef15 100644
--- a/example/CMakeLists.txt
+++ b/example/CMakeLists.txt
@@ -1,8 +1,8 @@
 # This is an example CMakeLists.txt file for use with the Asterisk SCF component common build system
 
 # You should specify the minimum version of cmake that is allowed. Unless you are using things that
-# require a higher version OR the Asterisk SCF.cmake file requires a higher version this can be left at 2.6
-cmake_minimum_required(VERSION 2.6)
+# require a higher version OR the Asterisk SCF.cmake file requires a higher version this can be left at 2.8
+cmake_minimum_required(VERSION 2.8)
 
 # This allows you to use the CPack package builder. You must install some package building generator, 
 # such as NullSoft Installer (NSI) on Windows. 

commit 6acd2b964fc48a19a4c1a5817bf1af10c617696c
Author: David M. Lee <dlee at digium.com>
Date:   Wed Jan 19 12:14:45 2011 -0600

    We require boost 1.40 or better.
    
    Now make it a configure time failure, instead of some random compile failure
    later in the build.

diff --git a/AsteriskSCF.cmake b/AsteriskSCF.cmake
index d930bd6..ed3bc5a 100644
--- a/AsteriskSCF.cmake
+++ b/AsteriskSCF.cmake
@@ -46,6 +46,8 @@
 # * Use the list() function for manipulating lists.
 #
 
+set(MIN_BOOST_VERSION 1.40)
+
 if(CMAKE_BINARY_DIR STREQUAL CMAKE_SOURCE_DIR)
     message(FATAL_ERROR "This project must not be built in the source directory")
 endif()
@@ -273,9 +275,9 @@ endfunction()
 function(find_Boost_library LIBRARY)
     if(NOT Boost_FOUND)
         set(Boost_ADDITIONAL_VERSIONS "1.39" "1.39.0" "1.40" "1.40.0" "1.41" "1.41.0" "1.42" "1.42.0" "1.44" "1.44.0")
-        find_package(Boost)
+        find_package(Boost ${MIN_BOOST_VERSION})
         if(NOT Boost_FOUND)
-            message(FATAL_ERROR "Boost libraries not found")
+            message(FATAL_ERROR "Boost libraries v${MIN_BOOST_VERSION} or better not found")
         endif()
         set(Boost_CORE_FOUND "bazinga" PARENT_SCOPE)
         set(Boost_CORE_FOUND "bazinga")

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


-- 
asterisk-scf/release/cmake.git