[Cmake-commits] CMake branch, next, updated. v3.3.0-rc2-678-g203c556
Bill Hoffman
bill.hoffman at kitware.com
Thu Jun 25 17:02:58 EDT 2015
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via 203c5567d04f1c925588e54b7c0c1c002219dcaa (commit)
via c8a7fa16f5036b192ba98c646e08b88d97b7382c (commit)
from 24f93e99d832b9194a158b2f5605a55580b12c52 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=203c5567d04f1c925588e54b7c0c1c002219dcaa
commit 203c5567d04f1c925588e54b7c0c1c002219dcaa
Merge: 24f93e9 c8a7fa1
Author: Bill Hoffman <bill.hoffman at kitware.com>
AuthorDate: Thu Jun 25 17:02:57 2015 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jun 25 17:02:57 2015 -0400
Merge topic 'auto_export_dll_symbols' into next
c8a7fa16 use Debug directory to find exe on Xcode
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c8a7fa16f5036b192ba98c646e08b88d97b7382c
commit c8a7fa16f5036b192ba98c646e08b88d97b7382c
Author: Bill Hoffman <bill.hoffman at kitware.com>
AuthorDate: Thu Jun 25 17:01:44 2015 -0400
Commit: Bill Hoffman <bill.hoffman at kitware.com>
CommitDate: Thu Jun 25 17:01:44 2015 -0400
use Debug directory to find exe on Xcode
diff --git a/Tests/RunCMake/AutoExportDll/RunCMakeTest.cmake b/Tests/RunCMake/AutoExportDll/RunCMakeTest.cmake
index ee89023..09cd42a 100644
--- a/Tests/RunCMake/AutoExportDll/RunCMakeTest.cmake
+++ b/Tests/RunCMake/AutoExportDll/RunCMakeTest.cmake
@@ -12,7 +12,7 @@ if("${RunCMake_GENERATOR}" MATCHES "Visual Studio 6")
endif()
# we build debug so the say.exe will be found in Debug/say.exe for
# Visual Studio generators
-if("${RunCMake_GENERATOR}" MATCHES "Visual Studio")
+if("${RunCMake_GENERATOR}" MATCHES "Visual Studio|Xcode")
set(INTDIR "Debug/")
endif()
# build AutoExport
-----------------------------------------------------------------------
Summary of changes:
Tests/RunCMake/AutoExportDll/RunCMakeTest.cmake | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list