[asterisk-scf-commits] asterisk-scf/integration/cmake.git branch "windows-64bit-build" updated.

[Commits to the Asterisk SCF project code repositories]

branch "windows-64bit-build" has been updated
       via  3b1ab0477916bb632fc6dd6100063a63d841add6 (commit)
      from  ee0bb7470e01043b82f2d72b5d52b66a001eae1e (commit)

Summary of changes:
 AsteriskSCF.cmake |   21 +++++++++++++++++----
 1 files changed, 17 insertions(+), 4 deletions(-)


- Log -----------------------------------------------------------------
commit 3b1ab0477916bb632fc6dd6100063a63d841add6
Author: Brent Eagles <beagles at digium.com>
Date:   Fri Apr 1 15:37:23 2011 -0230

    Add comment for pjproject define and fix Boost_ADDITIONAL_VERSIONS line.

diff --git a/AsteriskSCF.cmake b/AsteriskSCF.cmake
index 0cb6591..c0c0ba9 100644
--- a/AsteriskSCF.cmake
+++ b/AsteriskSCF.cmake
@@ -126,13 +126,26 @@ if(WIN32 AND ${CMAKE_BUILD_TYPE} STREQUAL profile)
     message(FATAL_ERROR "Profile builds not supported")
 endif()
 
-# The <config>.in files and any other script that reference binary 
-# directories need to account for the /Debug and /Release subdirectories for Windows.
 if(WIN32)
+    # The <config>.in files and any other script that reference binary 
+    # directories need to account for the /Debug and /Release subdirectories for Windows.
+    set(binsubdir "/${CMAKE_BUILD_TYPE}" CACHE INTERNAL "Subfolder for binary output. Only set on Windows.")
+
+    #
+    # On 64 bit builds on Windows (Windows x64), projects that include
+    # pjproject header files need to define the architecture to allow
+    # the appropriate definitions to be compiled in. Note that this may
+    # not be entirely accurate as its not clear whether CMake defines this
+    # as 1 when IA64 is the target. Seeing as IA64 is not common and our
+    # projects don't have support for it anyway, we'll go with the
+    # assumption that this is an x64 type platform.
+    #
     if(${CMAKE_CL_64})
         add_definitions(-D__amd64)	
     endif()
-    set(binsubdir "/${CMAKE_BUILD_TYPE}" CACHE INTERNAL "Subfolder for binary output. Only set on Windows.")
+endif()
+
+if(WIN32)
 endif()
 
 if(${CMAKE_BUILD_TYPE} STREQUAL profile)
@@ -281,7 +294,7 @@ endfunction()
 # Find a Boost library.
 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" "1.46" "1.46.1")
+        set(Boost_ADDITIONAL_VERSIONS "1.40" "1.40.0" "1.41" "1.41.0" "1.42" "1.42.0" "1.44" "1.44.0" "1.45" "1.45.0" "1.46" "1.46.0" "1.46.1")
         find_package(Boost ${MIN_BOOST_VERSION})
         if(NOT Boost_FOUND)
             message(FATAL_ERROR "Boost libraries v${MIN_BOOST_VERSION} or better not found")

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


-- 
asterisk-scf/integration/cmake.git