[Cmake-commits] CMake branch, next, updated. v3.3.1-2775-g5259219
Gregor Jasny
gjasny at googlemail.com
Sun Sep 6 14:48: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 5259219860a040eb81f50ea05ee47447d8220b4c (commit)
via 3b906c8003161f704cc33553f98b57d9dda461b9 (commit)
from cfbf38704d2ee4caedf3fff51244855b076a152d (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=5259219860a040eb81f50ea05ee47447d8220b4c
commit 5259219860a040eb81f50ea05ee47447d8220b4c
Merge: cfbf387 3b906c8
Author: Gregor Jasny <gjasny at googlemail.com>
AuthorDate: Sun Sep 6 14:48:57 2015 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sun Sep 6 14:48:57 2015 -0400
Merge topic 'fix-xcode-gtk2-tests' into next
3b906c80 GTK2: Add --build-project to all GTK2 tests
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3b906c8003161f704cc33553f98b57d9dda461b9
commit 3b906c8003161f704cc33553f98b57d9dda461b9
Author: Gregor Jasny <gjasny at googlemail.com>
AuthorDate: Sun Sep 6 20:41:41 2015 +0200
Commit: Gregor Jasny <gjasny at googlemail.com>
CommitDate: Sun Sep 6 20:41:41 2015 +0200
GTK2: Add --build-project to all GTK2 tests
Otherwise xcodebuild invocation will fail.
diff --git a/Tests/FindGTK2/CMakeLists.txt b/Tests/FindGTK2/CMakeLists.txt
index 1c5987c..0105fae 100644
--- a/Tests/FindGTK2/CMakeLists.txt
+++ b/Tests/FindGTK2/CMakeLists.txt
@@ -9,6 +9,7 @@ if(GTK2_GTK_FOUND)
"${CMake_BINARY_DIR}/Tests/FindGTK2/GTK2Components/gtk"
${build_generator_args}
--build-target gtk-all-libs
+ --build-project gtk
--build-exe-dir "${CMake_BINARY_DIR}/Tests/FindGTK2/GTK2Components/gtk"
--force-new-ctest-process
--test-command ${CMAKE_CTEST_COMMAND} -V
@@ -22,6 +23,7 @@ if(GTK2_GTKMM_FOUND)
"${CMake_BINARY_DIR}/Tests/FindGTK2/GTK2Components/gtkmm"
${build_generator_args}
--build-target gtkmm-all-libs
+ --build-project gtkmm
--build-exe-dir "${CMake_BINARY_DIR}/Tests/FindGTK2/GTK2Components/gtkmm"
--force-new-ctest-process
--test-command ${CMAKE_CTEST_COMMAND} -V
@@ -310,6 +312,7 @@ if(TARGET GTK2::gtkmm)
"${CMake_BINARY_DIR}/Tests/FindGTK2/GTK2Targets/gtkmm"
${build_generator_args}
--build-target gtkmm-target
+ --build-project gtkmm
--build-exe-dir "${CMake_BINARY_DIR}/Tests/FindGTK2/GTK2Targets/gtkmm"
--force-new-ctest-process
--test-command ${CMAKE_CTEST_COMMAND} -V
-----------------------------------------------------------------------
Summary of changes:
Tests/FindGTK2/CMakeLists.txt | 3 +++
1 file changed, 3 insertions(+)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list