[Cmake-commits] CMake branch, next, updated. v2.8.11.2-4222-gd8eb482
Daniele E. Domenichelli
daniele.domenichelli at gmail.com
Wed Sep 18 04:58:31 EDT 2013
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 d8eb48206fdf03333c9fb1588cae354dff0f734c (commit)
via 9ed99f7632aaf7520990791797e7c43d2f571ef8 (commit)
via 47655c4a84d1bc825b6ac6992e33ba8a9a8e3dfc (commit)
via 1e7d2b8332cef0984a4a988906748d3db92a4990 (commit)
from cfacea8b7c3b7f8f2bbe3e999ed57793d9b902d9 (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=d8eb48206fdf03333c9fb1588cae354dff0f734c
commit d8eb48206fdf03333c9fb1588cae354dff0f734c
Merge: cfacea8 9ed99f7
Author: Daniele E. Domenichelli <daniele.domenichelli at gmail.com>
AuthorDate: Wed Sep 18 04:58:28 2013 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Sep 18 04:58:28 2013 -0400
Merge topic 'FindGTK2-targets' into next
9ed99f7 FindGTK2: Do not add freetype includes if they are not found
47655c4 FindGTK2: Add libraries to the GTK2_LIBRARIES variable only when found
1e7d2b8 FindGTK2: Build tests in separate directories
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9ed99f7632aaf7520990791797e7c43d2f571ef8
commit 9ed99f7632aaf7520990791797e7c43d2f571ef8
Author: Daniele E. Domenichelli <daniele.domenichelli at iit.it>
AuthorDate: Tue Sep 17 16:49:26 2013 +0200
Commit: Daniele E. Domenichelli <daniele.domenichelli at iit.it>
CommitDate: Tue Sep 17 16:50:20 2013 +0200
FindGTK2: Do not add freetype includes if they are not found
On some older system they are not required
diff --git a/Modules/FindGTK2.cmake b/Modules/FindGTK2.cmake
index 2108e7e..2f84cb3 100644
--- a/Modules/FindGTK2.cmake
+++ b/Modules/FindGTK2.cmake
@@ -481,7 +481,9 @@ function(_GTK2_ADD_TARGET_INCLUDE_DIRS _var)
if(TARGET GTK2::${_basename})
foreach(_include ${ARGN})
- set_property(TARGET GTK2::${_basename} APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES "${_include}")
+ if(${_include})
+ set_property(TARGET GTK2::${_basename} APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES "${_include}")
+ endif()
endforeach()
endif()
endfunction()
@@ -571,7 +573,9 @@ endif()
#
find_package(Freetype QUIET)
-list(APPEND GTK2_INCLUDE_DIRS ${FREETYPE_INCLUDE_DIR_ft2build} ${FREETYPE_INCLUDE_DIR_freetype2})
+if(${FREETYPE_INCLUDE_DIR_ft2build} AND ${FREETYPE_INCLUDE_DIR_freetype2})
+ list(APPEND GTK2_INCLUDE_DIRS ${FREETYPE_INCLUDE_DIR_ft2build} ${FREETYPE_INCLUDE_DIR_freetype2})
+endif()
foreach(_GTK2_component ${GTK2_FIND_COMPONENTS})
if(_GTK2_component STREQUAL "gtk")
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=47655c4a84d1bc825b6ac6992e33ba8a9a8e3dfc
commit 47655c4a84d1bc825b6ac6992e33ba8a9a8e3dfc
Author: Daniele E. Domenichelli <daniele.domenichelli at iit.it>
AuthorDate: Tue Sep 17 15:04:45 2013 +0200
Commit: Daniele E. Domenichelli <daniele.domenichelli at iit.it>
CommitDate: Tue Sep 17 16:50:13 2013 +0200
FindGTK2: Add libraries to the GTK2_LIBRARIES variable only when found
Some libraries (e.g. gio) are not necessary, and often not available
with older GTK2 versions, therefore GTK_LIBRARIES should not contain
GTK2_XXX-NOT_FOUND for these libraries.
diff --git a/Modules/FindGTK2.cmake b/Modules/FindGTK2.cmake
index a9f0d6e..2108e7e 100644
--- a/Modules/FindGTK2.cmake
+++ b/Modules/FindGTK2.cmake
@@ -370,8 +370,10 @@ function(_GTK2_FIND_LIBRARY _var _lib _expand_vc _append_version)
set(GTK2_${_var}_LIBRARY ${GTK2_${_var}_LIBRARY} PARENT_SCOPE)
set(GTK2_${_var}_FOUND ${GTK2_${_var}_FOUND} PARENT_SCOPE)
- set(GTK2_LIBRARIES ${GTK2_LIBRARIES} ${GTK2_${_var}_LIBRARY})
- set(GTK2_LIBRARIES ${GTK2_LIBRARIES} PARENT_SCOPE)
+ if(GTK2_${_var}_FOUND)
+ set(GTK2_LIBRARIES ${GTK2_LIBRARIES} ${GTK2_${_var}_LIBRARY})
+ set(GTK2_LIBRARIES ${GTK2_LIBRARIES} PARENT_SCOPE)
+ endif()
if(GTK2_DEBUG)
message(STATUS "[FindGTK2.cmake:${CMAKE_CURRENT_LIST_LINE}] "
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1e7d2b8332cef0984a4a988906748d3db92a4990
commit 1e7d2b8332cef0984a4a988906748d3db92a4990
Author: Daniele E. Domenichelli <daniele.domenichelli at iit.it>
AuthorDate: Tue Sep 17 12:32:30 2013 +0200
Commit: Daniele E. Domenichelli <daniele.domenichelli at iit.it>
CommitDate: Tue Sep 17 16:50:05 2013 +0200
FindGTK2: Build tests in separate directories
This should fix the tests failing when running in parallel
diff --git a/Tests/FindGTK2/CMakeLists.txt b/Tests/FindGTK2/CMakeLists.txt
index f9470d3..01f73e1 100644
--- a/Tests/FindGTK2/CMakeLists.txt
+++ b/Tests/FindGTK2/CMakeLists.txt
@@ -4,10 +4,10 @@ if(GTK2_GLIB_FOUND)
add_test(GTK2Targets.glib ${CMAKE_CTEST_COMMAND}
--build-and-test
"${CMake_SOURCE_DIR}/Tests/FindGTK2/glib"
- "${CMake_BINARY_DIR}/Tests/FindGTK2/glib"
+ "${CMake_BINARY_DIR}/Tests/FindGTK2/GTK2Targets/glib"
${build_generator_args}
--build-project glib
- --build-exe-dir "${CMake_BINARY_DIR}/Tests/FindGTK2/glib"
+ --build-exe-dir "${CMake_BINARY_DIR}/Tests/FindGTK2/GTK2Targets/glib"
--force-new-ctest-process
--test-command ${CMAKE_CTEST_COMMAND} -V
)
@@ -17,10 +17,10 @@ if(GTK2_GOBJECT_FOUND)
add_test(GTK2Targets.gobject ${CMAKE_CTEST_COMMAND}
--build-and-test
"${CMake_SOURCE_DIR}/Tests/FindGTK2/gobject"
- "${CMake_BINARY_DIR}/Tests/FindGTK2/gobject"
+ "${CMake_BINARY_DIR}/Tests/FindGTK2/GTK2Targets/gobject"
${build_generator_args}
--build-project gobject
- --build-exe-dir "${CMake_BINARY_DIR}/Tests/FindGTK2/gobject"
+ --build-exe-dir "${CMake_BINARY_DIR}/Tests/FindGTK2/GTK2Targets/gobject"
--force-new-ctest-process
--test-command ${CMAKE_CTEST_COMMAND} -V
)
@@ -30,10 +30,10 @@ if(GTK2_GIO_FOUND)
add_test(GTK2Targets.gio ${CMAKE_CTEST_COMMAND}
--build-and-test
"${CMake_SOURCE_DIR}/Tests/FindGTK2/gio"
- "${CMake_BINARY_DIR}/Tests/FindGTK2/gio"
+ "${CMake_BINARY_DIR}/Tests/FindGTK2/GTK2Targets/gio"
${build_generator_args}
--build-project gio
- --build-exe-dir "${CMake_BINARY_DIR}/Tests/FindGTK2/gio"
+ --build-exe-dir "${CMake_BINARY_DIR}/Tests/FindGTK2/GTK2Targets/gio"
--force-new-ctest-process
--test-command ${CMAKE_CTEST_COMMAND} -V
)
@@ -43,10 +43,10 @@ if(GTK2_GMODULE_FOUND)
add_test(GTK2Targets.gmodule ${CMAKE_CTEST_COMMAND}
--build-and-test
"${CMake_SOURCE_DIR}/Tests/FindGTK2/gmodule"
- "${CMake_BINARY_DIR}/Tests/FindGTK2/gmodule"
+ "${CMake_BINARY_DIR}/Tests/FindGTK2/GTK2Targets/gmodule"
${build_generator_args}
--build-project gmodule
- --build-exe-dir "${CMake_BINARY_DIR}/Tests/FindGTK2/gmodule"
+ --build-exe-dir "${CMake_BINARY_DIR}/Tests/FindGTK2/GTK2Targets/gmodule"
--force-new-ctest-process
--test-command ${CMAKE_CTEST_COMMAND} -V
)
@@ -56,10 +56,10 @@ if(GTK2_GTHREAD_FOUND)
add_test(GTK2Targets.gthread ${CMAKE_CTEST_COMMAND}
--build-and-test
"${CMake_SOURCE_DIR}/Tests/FindGTK2/gthread"
- "${CMake_BINARY_DIR}/Tests/FindGTK2/gthread"
+ "${CMake_BINARY_DIR}/Tests/FindGTK2/GTK2Targets/gthread"
${build_generator_args}
--build-project gthread
- --build-exe-dir "${CMake_BINARY_DIR}/Tests/FindGTK2/gthread"
+ --build-exe-dir "${CMake_BINARY_DIR}/Tests/FindGTK2/GTK2Targets/gthread"
--force-new-ctest-process
--test-command ${CMAKE_CTEST_COMMAND} -V
)
@@ -69,10 +69,10 @@ if(GTK2_ATK_FOUND)
add_test(GTK2Targets.atk ${CMAKE_CTEST_COMMAND}
--build-and-test
"${CMake_SOURCE_DIR}/Tests/FindGTK2/atk"
- "${CMake_BINARY_DIR}/Tests/FindGTK2/atk"
+ "${CMake_BINARY_DIR}/Tests/FindGTK2/GTK2Targets/atk"
${build_generator_args}
--build-project atk
- --build-exe-dir "${CMake_BINARY_DIR}/Tests/FindGTK2/atk"
+ --build-exe-dir "${CMake_BINARY_DIR}/Tests/FindGTK2/GTK2Targets/atk"
--force-new-ctest-process
--test-command ${CMAKE_CTEST_COMMAND} -V
)
@@ -82,10 +82,10 @@ if(GTK2_GDK_PIXBUF_FOUND)
add_test(GTK2Targets.gdk_pixbuf ${CMAKE_CTEST_COMMAND}
--build-and-test
"${CMake_SOURCE_DIR}/Tests/FindGTK2/gdk_pixbuf"
- "${CMake_BINARY_DIR}/Tests/FindGTK2/gdk_pixbuf"
+ "${CMake_BINARY_DIR}/Tests/FindGTK2/GTK2Targets/gdk_pixbuf"
${build_generator_args}
--build-project gdk_pixbuf
- --build-exe-dir "${CMake_BINARY_DIR}/Tests/FindGTK2/gdk_pixbuf"
+ --build-exe-dir "${CMake_BINARY_DIR}/Tests/FindGTK2/GTK2Targets/gdk_pixbuf"
--force-new-ctest-process
--test-command ${CMAKE_CTEST_COMMAND} -V
)
@@ -95,10 +95,10 @@ if(GTK2_CAIRO_FOUND)
add_test(GTK2Targets.cairo ${CMAKE_CTEST_COMMAND}
--build-and-test
"${CMake_SOURCE_DIR}/Tests/FindGTK2/cairo"
- "${CMake_BINARY_DIR}/Tests/FindGTK2/cairo"
+ "${CMake_BINARY_DIR}/Tests/FindGTK2/GTK2Targets/cairo"
${build_generator_args}
--build-project cairo
- --build-exe-dir "${CMake_BINARY_DIR}/Tests/FindGTK2/cairo"
+ --build-exe-dir "${CMake_BINARY_DIR}/Tests/FindGTK2/GTK2Targets/cairo"
--force-new-ctest-process
--test-command ${CMAKE_CTEST_COMMAND} -V
)
@@ -108,10 +108,10 @@ if(GTK2_PANGO_FOUND)
add_test(GTK2Targets.pango ${CMAKE_CTEST_COMMAND}
--build-and-test
"${CMake_SOURCE_DIR}/Tests/FindGTK2/pango"
- "${CMake_BINARY_DIR}/Tests/FindGTK2/pango"
+ "${CMake_BINARY_DIR}/Tests/FindGTK2/GTK2Targets/pango"
${build_generator_args}
--build-project pango
- --build-exe-dir "${CMake_BINARY_DIR}/Tests/FindGTK2/pango"
+ --build-exe-dir "${CMake_BINARY_DIR}/Tests/FindGTK2/GTK2Targets/pango"
--force-new-ctest-process
--test-command ${CMAKE_CTEST_COMMAND} -V
)
@@ -121,10 +121,10 @@ if(GTK2_PANGOCAIRO_FOUND)
add_test(GTK2Targets.pangocairo ${CMAKE_CTEST_COMMAND}
--build-and-test
"${CMake_SOURCE_DIR}/Tests/FindGTK2/pangocairo"
- "${CMake_BINARY_DIR}/Tests/FindGTK2/pangocairo"
+ "${CMake_BINARY_DIR}/Tests/FindGTK2/GTK2Targets/pangocairo"
${build_generator_args}
--build-project pangocairo
- --build-exe-dir "${CMake_BINARY_DIR}/Tests/FindGTK2/pangocairo"
+ --build-exe-dir "${CMake_BINARY_DIR}/Tests/FindGTK2/GTK2Targets/pangocairo"
--force-new-ctest-process
--test-command ${CMAKE_CTEST_COMMAND} -V
)
@@ -134,10 +134,10 @@ if(GTK2_PANGOXFT_FOUND)
add_test(GTK2Targets.pangoxft ${CMAKE_CTEST_COMMAND}
--build-and-test
"${CMake_SOURCE_DIR}/Tests/FindGTK2/pangoxft"
- "${CMake_BINARY_DIR}/Tests/FindGTK2/pangoxft"
+ "${CMake_BINARY_DIR}/Tests/FindGTK2/GTK2Targets/pangoxft"
${build_generator_args}
--build-project pangoxft
- --build-exe-dir "${CMake_BINARY_DIR}/Tests/FindGTK2/pangoxft"
+ --build-exe-dir "${CMake_BINARY_DIR}/Tests/FindGTK2/GTK2Targets/pangoxft"
--force-new-ctest-process
--test-command ${CMAKE_CTEST_COMMAND} -V
)
@@ -147,10 +147,10 @@ if(GTK2_PANGOFT2_FOUND)
add_test(GTK2Targets.pangoft2 ${CMAKE_CTEST_COMMAND}
--build-and-test
"${CMake_SOURCE_DIR}/Tests/FindGTK2/pangoft2"
- "${CMake_BINARY_DIR}/Tests/FindGTK2/pangoft2"
+ "${CMake_BINARY_DIR}/Tests/FindGTK2/GTK2Targets/pangoft2"
${build_generator_args}
--build-project pangoft2
- --build-exe-dir "${CMake_BINARY_DIR}/Tests/FindGTK2/pangoft2"
+ --build-exe-dir "${CMake_BINARY_DIR}/Tests/FindGTK2/GTK2Targets/pangoft2"
--force-new-ctest-process
--test-command ${CMAKE_CTEST_COMMAND} -V
)
@@ -160,10 +160,10 @@ if(GTK2_GDK_FOUND)
add_test(GTK2Targets.gdk ${CMAKE_CTEST_COMMAND}
--build-and-test
"${CMake_SOURCE_DIR}/Tests/FindGTK2/gdk"
- "${CMake_BINARY_DIR}/Tests/FindGTK2/gdk"
+ "${CMake_BINARY_DIR}/Tests/FindGTK2/GTK2Targets/gdk"
${build_generator_args}
--build-project gdk
- --build-exe-dir "${CMake_BINARY_DIR}/Tests/FindGTK2/gdk"
+ --build-exe-dir "${CMake_BINARY_DIR}/Tests/FindGTK2/GTK2Targets/gdk"
--force-new-ctest-process
--test-command ${CMAKE_CTEST_COMMAND} -V
)
@@ -173,10 +173,10 @@ if(GTK2_GTK_FOUND)
add_test(GTK2Targets.gtk ${CMAKE_CTEST_COMMAND}
--build-and-test
"${CMake_SOURCE_DIR}/Tests/FindGTK2/gtk"
- "${CMake_BINARY_DIR}/Tests/FindGTK2/gtk"
+ "${CMake_BINARY_DIR}/Tests/FindGTK2/GTK2Targets/gtk"
${build_generator_args}
--build-project gtk
- --build-exe-dir "${CMake_BINARY_DIR}/Tests/FindGTK2/gtk"
+ --build-exe-dir "${CMake_BINARY_DIR}/Tests/FindGTK2/GTK2Targets/gtk"
--force-new-ctest-process
--test-command ${CMAKE_CTEST_COMMAND} -V
)
@@ -184,10 +184,10 @@ if(GTK2_GTK_FOUND)
add_test(GTK2Components.gtk ${CMAKE_CTEST_COMMAND}
--build-and-test
"${CMake_SOURCE_DIR}/Tests/FindGTK2/gtk"
- "${CMake_BINARY_DIR}/Tests/FindGTK2/gtk"
+ "${CMake_BINARY_DIR}/Tests/FindGTK2/GTK2Components/gtk"
${build_generator_args}
--build-target gtk-all-libs
- --build-exe-dir "${CMake_BINARY_DIR}/Tests/FindGTK2/gtk"
+ --build-exe-dir "${CMake_BINARY_DIR}/Tests/FindGTK2/GTK2Components/gtk"
--force-new-ctest-process
--test-command ${CMAKE_CTEST_COMMAND} -V
)
@@ -197,10 +197,10 @@ if(GTK2_SIGC++_FOUND)
add_test(GTK2Targets.sigc++ ${CMAKE_CTEST_COMMAND}
--build-and-test
"${CMake_SOURCE_DIR}/Tests/FindGTK2/sigc++"
- "${CMake_BINARY_DIR}/Tests/FindGTK2/sigc++"
+ "${CMake_BINARY_DIR}/Tests/FindGTK2/GTK2Targets/sigc++"
${build_generator_args}
--build-project sigc++
- --build-exe-dir "${CMake_BINARY_DIR}/Tests/FindGTK2/sigc++"
+ --build-exe-dir "${CMake_BINARY_DIR}/Tests/FindGTK2/GTK2Targets/sigc++"
--force-new-ctest-process
--test-command ${CMAKE_CTEST_COMMAND} -V
)
@@ -210,10 +210,10 @@ if(GTK2_GLIBMM_FOUND)
add_test(GTK2Targets.glibmm ${CMAKE_CTEST_COMMAND}
--build-and-test
"${CMake_SOURCE_DIR}/Tests/FindGTK2/glibmm"
- "${CMake_BINARY_DIR}/Tests/FindGTK2/glibmm"
+ "${CMake_BINARY_DIR}/Tests/FindGTK2/GTK2Targets/glibmm"
${build_generator_args}
--build-project glibmm
- --build-exe-dir "${CMake_BINARY_DIR}/Tests/FindGTK2/glibmm"
+ --build-exe-dir "${CMake_BINARY_DIR}/Tests/FindGTK2/GTK2Targets/glibmm"
--force-new-ctest-process
--test-command ${CMAKE_CTEST_COMMAND} -V
)
@@ -223,10 +223,10 @@ if(GTK2_GIOMM_FOUND)
add_test(GTK2Targets.giomm ${CMAKE_CTEST_COMMAND}
--build-and-test
"${CMake_SOURCE_DIR}/Tests/FindGTK2/giomm"
- "${CMake_BINARY_DIR}/Tests/FindGTK2/giomm"
+ "${CMake_BINARY_DIR}/Tests/FindGTK2/GTK2Targets/giomm"
${build_generator_args}
--build-project giomm
- --build-exe-dir "${CMake_BINARY_DIR}/Tests/FindGTK2/giomm"
+ --build-exe-dir "${CMake_BINARY_DIR}/Tests/FindGTK2/GTK2Targets/giomm"
--force-new-ctest-process
--test-command ${CMAKE_CTEST_COMMAND} -V
)
@@ -236,10 +236,10 @@ if(GTK2_ATKMM_FOUND)
add_test(GTK2Targets.atkmm ${CMAKE_CTEST_COMMAND}
--build-and-test
"${CMake_SOURCE_DIR}/Tests/FindGTK2/atkmm"
- "${CMake_BINARY_DIR}/Tests/FindGTK2/atkmm"
+ "${CMake_BINARY_DIR}/Tests/FindGTK2/GTK2Targets/atkmm"
${build_generator_args}
--build-project atkmm
- --build-exe-dir "${CMake_BINARY_DIR}/Tests/FindGTK2/atkmm"
+ --build-exe-dir "${CMake_BINARY_DIR}/Tests/FindGTK2/GTK2Targets/atkmm"
--force-new-ctest-process
--test-command ${CMAKE_CTEST_COMMAND} -V
)
@@ -249,10 +249,10 @@ if(GTK2_CAIROMM_FOUND)
add_test(GTK2Targets.cairomm ${CMAKE_CTEST_COMMAND}
--build-and-test
"${CMake_SOURCE_DIR}/Tests/FindGTK2/cairomm"
- "${CMake_BINARY_DIR}/Tests/FindGTK2/cairomm"
+ "${CMake_BINARY_DIR}/Tests/FindGTK2/GTK2Targets/cairomm"
${build_generator_args}
--build-project cairomm
- --build-exe-dir "${CMake_BINARY_DIR}/Tests/FindGTK2/cairomm"
+ --build-exe-dir "${CMake_BINARY_DIR}/Tests/FindGTK2/GTK2Targets/cairomm"
--force-new-ctest-process
--test-command ${CMAKE_CTEST_COMMAND} -V
)
@@ -262,10 +262,10 @@ if(GTK2_PANGOMM_FOUND)
add_test(GTK2Targets.pangomm ${CMAKE_CTEST_COMMAND}
--build-and-test
"${CMake_SOURCE_DIR}/Tests/FindGTK2/pangomm"
- "${CMake_BINARY_DIR}/Tests/FindGTK2/pangomm"
+ "${CMake_BINARY_DIR}/Tests/FindGTK2/GTK2Targets/pangomm"
${build_generator_args}
--build-project pangomm
- --build-exe-dir "${CMake_BINARY_DIR}/Tests/FindGTK2/pangomm"
+ --build-exe-dir "${CMake_BINARY_DIR}/Tests/FindGTK2/GTK2Targets/pangomm"
--force-new-ctest-process
--test-command ${CMAKE_CTEST_COMMAND} -V
)
@@ -275,10 +275,10 @@ if(GTK2_GDKMM_FOUND)
add_test(GTK2Targets.gdkmm ${CMAKE_CTEST_COMMAND}
--build-and-test
"${CMake_SOURCE_DIR}/Tests/FindGTK2/gdkmm"
- "${CMake_BINARY_DIR}/Tests/FindGTK2/gdkmm"
+ "${CMake_BINARY_DIR}/Tests/FindGTK2/GTK2Targets/GTK2Targets/gdkmm"
${build_generator_args}
--build-project gdkmm
- --build-exe-dir "${CMake_BINARY_DIR}/Tests/FindGTK2/gdkmm"
+ --build-exe-dir "${CMake_BINARY_DIR}/Tests/FindGTK2/GTK2Targets/GTK2Targets/gdkmm"
--force-new-ctest-process
--test-command ${CMAKE_CTEST_COMMAND} -V
)
@@ -288,10 +288,10 @@ if(GTK2_GTKMM_FOUND)
add_test(GTK2Targets.gtkmm ${CMAKE_CTEST_COMMAND}
--build-and-test
"${CMake_SOURCE_DIR}/Tests/FindGTK2/gtkmm"
- "${CMake_BINARY_DIR}/Tests/FindGTK2/gtkmm"
+ "${CMake_BINARY_DIR}/Tests/FindGTK2/GTK2Targets/gtkmm"
${build_generator_args}
--build-target gtkmm-target
- --build-exe-dir "${CMake_BINARY_DIR}/Tests/FindGTK2/gtkmm"
+ --build-exe-dir "${CMake_BINARY_DIR}/Tests/FindGTK2/GTK2Targets/gtkmm"
--force-new-ctest-process
--test-command ${CMAKE_CTEST_COMMAND} -V
)
@@ -299,10 +299,10 @@ if(GTK2_GTKMM_FOUND)
add_test(GTK2Components.gtkmm ${CMAKE_CTEST_COMMAND}
--build-and-test
"${CMake_SOURCE_DIR}/Tests/FindGTK2/gtkmm"
- "${CMake_BINARY_DIR}/Tests/FindGTK2/gtkmm"
+ "${CMake_BINARY_DIR}/Tests/FindGTK2/GTK2Components/gtkmm"
${build_generator_args}
--build-target gtkmm-all-libs
- --build-exe-dir "${CMake_BINARY_DIR}/Tests/FindGTK2/gtkmm"
+ --build-exe-dir "${CMake_BINARY_DIR}/Tests/FindGTK2/GTK2Components/gtkmm"
--force-new-ctest-process
--test-command ${CMAKE_CTEST_COMMAND} -V
)
-----------------------------------------------------------------------
Summary of changes:
Modules/FindGTK2.cmake | 14 ++++--
Tests/FindGTK2/CMakeLists.txt | 96 ++++++++++++++++++++--------------------
2 files changed, 58 insertions(+), 52 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list