[asterisk-scf-commits] asterisk-scf/release/cmake.git branch "master" updated.
Commits to the Asterisk SCF project code repositories
asterisk-scf-commits at lists.digium.com
Tue Mar 22 13:56:10 CDT 2011
branch "master" has been updated
via 4af2764093ea2a710426efdcd96b0b752e7bf1f7 (commit)
from a220f984fea748c185c00c4a13abe5043651f83c (commit)
Summary of changes:
AsteriskSCF.cmake | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
- Log -----------------------------------------------------------------
commit 4af2764093ea2a710426efdcd96b0b752e7bf1f7
Author: Ken Hunt <ken.hunt at digium.com>
Date: Tue Mar 22 13:52:31 2011 -0500
Added variable 'binsubdir' for binary subdirectory which is only set on Windows. All cmake script
that references a binary directory (such as the <config>.in files) should use this variable
to account for the /Debug, /Release, etc. subfolder where Windows binaries are output.
diff --git a/AsteriskSCF.cmake b/AsteriskSCF.cmake
index 576b6bd..0781a41 100644
--- a/AsteriskSCF.cmake
+++ b/AsteriskSCF.cmake
@@ -126,6 +126,12 @@ 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)
+ set(binsubdir "/${CMAKE_BUILD_TYPE}" CACHE INTERNAL "Subfolder for binary output. Only set on Windows.")
+endif()
+
if(${CMAKE_BUILD_TYPE} STREQUAL profile)
message(STATUS "Disabling shared libs.")
set(BUILD_SHARED_LIBS false
-----------------------------------------------------------------------
--
asterisk-scf/release/cmake.git
More information about the asterisk-scf-commits
mailing list