[asterisk-scf-commits] asterisk-scf/integration/cmake.git branch "vs-binoutdir-var" created.

[Commits to the Asterisk SCF project code repositories]

branch "vs-binoutdir-var" has been created
        at  f7dc91a1d56f7f8e4f5eb6618b4877539346d739 (commit)

- Log -----------------------------------------------------------------
commit f7dc91a1d56f7f8e4f5eb6618b4877539346d739
Author: Ken Hunt <ken.hunt at digium.com>
Date:   Fri Apr 1 16:22:55 2011 -0500

    Set a variable to hold the binary output folder name for Visual Studio builds only.

diff --git a/AsteriskSCF.cmake b/AsteriskSCF.cmake
index 2eff59c..eb8c613 100644
--- a/AsteriskSCF.cmake
+++ b/AsteriskSCF.cmake
@@ -127,8 +127,9 @@ if(WIN32 AND ${CMAKE_BUILD_TYPE} STREQUAL profile)
 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)
+# directories need to account for the /Debug and /Release subdirectories 
+# for all Visual Studio builds.
+if((WIN32) AND  NOT (CMAKE_BUILD_TOOL STREQUAL "nmake"))
 	set(binsubdir "/${CMAKE_BUILD_TYPE}" CACHE INTERNAL "Subfolder for binary output. Only set on Windows.")
 endif()
 

commit 373e081ef8278f0489cd59014ffab0010a1bc5c9
Author: Kevin P. Fleming <kpfleming at digium.com>
Date:   Fri Apr 1 15:19:49 2011 -0500

    FindBoost.cmake doesn't cause the script to fail if a library component isn't
    found, even if REQUIRED is specified. In order to abort the script when this
    happens, the script will now issue a FATAL_ERROR message if a required Boost
    library could not be found.

diff --git a/AsteriskSCF.cmake b/AsteriskSCF.cmake
index 3c20b08..2eff59c 100644
--- a/AsteriskSCF.cmake
+++ b/AsteriskSCF.cmake
@@ -290,6 +290,9 @@ function(find_Boost_library LIBRARY)
     if(NOT Boost_${libtag}_FOUND)
         find_package(Boost REQUIRED ${LIBRARY})
     endif()
+    if(NOT Boost_${libtag}_FOUND)
+        message(FATAL_ERROR "Boost library ${LIBRARY} not found")
+    endif()
 endfunction()
 
 # Function which adds Boost libraries to all components in the current

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


-- 
asterisk-scf/integration/cmake.git