[Cmake-commits] CMake branch, next, updated. v2.8.11.2-4091-g719bc22
Daniele E. Domenichelli
daniele.domenichelli at gmail.com
Fri Sep 6 10:04:39 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 719bc22a69cccaba7a6d788cb98b68925e798f76 (commit)
via f97c7a0aa2a2f64d0c04cf56030e72dac8997a2c (commit)
via 286dc0afbf36883d4f6c5091ccb18707d8477a69 (commit)
via cecc70aa3a932f98a95851182661457ef92e2c9f (commit)
via f9249f6871b37ab512b1a02135a6707784e151ec (commit)
via e71ebb6e13a06a9d068a04263c2a645474dc1fe8 (commit)
via a8b190b3dd00628adfc5e050d78239a399bfb3c7 (commit)
from 6c91d8df6106403fe6100edb738621deb184e854 (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=719bc22a69cccaba7a6d788cb98b68925e798f76
commit 719bc22a69cccaba7a6d788cb98b68925e798f76
Merge: 6c91d8d f97c7a0
Author: Daniele E. Domenichelli <daniele.domenichelli at gmail.com>
AuthorDate: Fri Sep 6 10:04:23 2013 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Sep 6 10:04:23 2013 -0400
Merge topic 'FindGTK2-targets' into next
f97c7a0 Merge topic 'FindGTK2-quiet' into FindGTK2-targets
286dc0a FindGTK2: Rename directory for unit tests
cecc70a FindGTK2: Add test for components using variables
f9249f6 FindGTK2: Do not link libfreetype
e71ebb6 FindGTK2: Add config directories only if different from include ones
a8b190b FindGTK2: Set INTERFACE_COMPILE_DEFINITIONS target property only if not empty
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f97c7a0aa2a2f64d0c04cf56030e72dac8997a2c
commit f97c7a0aa2a2f64d0c04cf56030e72dac8997a2c
Merge: 286dc0a ac92d75
Author: Daniele E. Domenichelli <daniele.domenichelli at iit.it>
AuthorDate: Fri Sep 6 16:03:14 2013 +0200
Commit: Daniele E. Domenichelli <daniele.domenichelli at iit.it>
CommitDate: Fri Sep 6 16:03:14 2013 +0200
Merge topic 'FindGTK2-quiet' into FindGTK2-targets
Conflicts:
Modules/FindGTK2.cmake
diff --cc Modules/FindGTK2.cmake
index 6140be9,316a2da..738e022
--- a/Modules/FindGTK2.cmake
+++ b/Modules/FindGTK2.cmake
@@@ -243,9 -240,10 +243,10 @@@ function(_GTK2_FIND_INCLUDE_DIR _var _h
PATH_SUFFIXES
${_suffixes}
)
+ mark_as_advanced(GTK2_${_var}_INCLUDE_DIR)
- if(${_var}_INCLUDE_DIR)
- set(GTK2_INCLUDE_DIRS ${GTK2_INCLUDE_DIRS} ${${_var}_INCLUDE_DIR} PARENT_SCOPE)
+ if(GTK2_${_var}_INCLUDE_DIR)
+ set(GTK2_INCLUDE_DIRS ${GTK2_INCLUDE_DIRS} ${GTK2_${_var}_INCLUDE_DIR} PARENT_SCOPE)
endif()
endfunction()
@@@ -567,8 -450,9 +568,8 @@@ endif(
# Find all components
#
- find_package(Freetype)
+ find_package(Freetype QUIET)
-list(APPEND GTK2_INCLUDE_DIRS ${FREETYPE_INCLUDE_DIRS})
-list(APPEND GTK2_LIBRARIES ${FREETYPE_LIBRARIES})
+list(APPEND GTK2_INCLUDE_DIRS ${FREETYPE_INCLUDE_DIR_ft2build} ${FREETYPE_INCLUDE_DIR_freetype2})
foreach(_GTK2_component ${GTK2_FIND_COMPONENTS})
if(_GTK2_component STREQUAL "gtk")
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=286dc0afbf36883d4f6c5091ccb18707d8477a69
commit 286dc0afbf36883d4f6c5091ccb18707d8477a69
Author: Daniele E. Domenichelli <daniele.domenichelli at iit.it>
AuthorDate: Fri Sep 6 15:13:15 2013 +0200
Commit: Daniele E. Domenichelli <daniele.domenichelli at iit.it>
CommitDate: Fri Sep 6 15:53:44 2013 +0200
FindGTK2: Rename directory for unit tests
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 993a826..7e41656 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -1071,7 +1071,7 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=master -P ${CMake_SOURCE_DIR}/Utilities/
find_package(GTK2 QUIET)
if(GTK2_FOUND)
- add_subdirectory(GTK2Targets)
+ add_subdirectory(FindGTK2)
endif()
add_test(ExternalProject ${CMAKE_CTEST_COMMAND}
diff --git a/Tests/GTK2Targets/CMakeLists.txt b/Tests/FindGTK2/CMakeLists.txt
similarity index 59%
rename from Tests/GTK2Targets/CMakeLists.txt
rename to Tests/FindGTK2/CMakeLists.txt
index 154ff92..f9470d3 100644
--- a/Tests/GTK2Targets/CMakeLists.txt
+++ b/Tests/FindGTK2/CMakeLists.txt
@@ -3,11 +3,11 @@ find_package(GTK2 COMPONENTS gtk glade gtkmm glademm QUIET)
if(GTK2_GLIB_FOUND)
add_test(GTK2Targets.glib ${CMAKE_CTEST_COMMAND}
--build-and-test
- "${CMake_SOURCE_DIR}/Tests/GTK2Targets/glib"
- "${CMake_BINARY_DIR}/Tests/GTK2Targets/glib"
+ "${CMake_SOURCE_DIR}/Tests/FindGTK2/glib"
+ "${CMake_BINARY_DIR}/Tests/FindGTK2/glib"
${build_generator_args}
--build-project glib
- --build-exe-dir "${CMake_BINARY_DIR}/Tests/GTK2Targets/glib"
+ --build-exe-dir "${CMake_BINARY_DIR}/Tests/FindGTK2/glib"
--force-new-ctest-process
--test-command ${CMAKE_CTEST_COMMAND} -V
)
@@ -16,11 +16,11 @@ endif()
if(GTK2_GOBJECT_FOUND)
add_test(GTK2Targets.gobject ${CMAKE_CTEST_COMMAND}
--build-and-test
- "${CMake_SOURCE_DIR}/Tests/GTK2Targets/gobject"
- "${CMake_BINARY_DIR}/Tests/GTK2Targets/gobject"
+ "${CMake_SOURCE_DIR}/Tests/FindGTK2/gobject"
+ "${CMake_BINARY_DIR}/Tests/FindGTK2/gobject"
${build_generator_args}
--build-project gobject
- --build-exe-dir "${CMake_BINARY_DIR}/Tests/GTK2Targets/gobject"
+ --build-exe-dir "${CMake_BINARY_DIR}/Tests/FindGTK2/gobject"
--force-new-ctest-process
--test-command ${CMAKE_CTEST_COMMAND} -V
)
@@ -29,11 +29,11 @@ endif()
if(GTK2_GIO_FOUND)
add_test(GTK2Targets.gio ${CMAKE_CTEST_COMMAND}
--build-and-test
- "${CMake_SOURCE_DIR}/Tests/GTK2Targets/gio"
- "${CMake_BINARY_DIR}/Tests/GTK2Targets/gio"
+ "${CMake_SOURCE_DIR}/Tests/FindGTK2/gio"
+ "${CMake_BINARY_DIR}/Tests/FindGTK2/gio"
${build_generator_args}
--build-project gio
- --build-exe-dir "${CMake_BINARY_DIR}/Tests/GTK2Targets/gio"
+ --build-exe-dir "${CMake_BINARY_DIR}/Tests/FindGTK2/gio"
--force-new-ctest-process
--test-command ${CMAKE_CTEST_COMMAND} -V
)
@@ -42,11 +42,11 @@ endif()
if(GTK2_GMODULE_FOUND)
add_test(GTK2Targets.gmodule ${CMAKE_CTEST_COMMAND}
--build-and-test
- "${CMake_SOURCE_DIR}/Tests/GTK2Targets/gmodule"
- "${CMake_BINARY_DIR}/Tests/GTK2Targets/gmodule"
+ "${CMake_SOURCE_DIR}/Tests/FindGTK2/gmodule"
+ "${CMake_BINARY_DIR}/Tests/FindGTK2/gmodule"
${build_generator_args}
--build-project gmodule
- --build-exe-dir "${CMake_BINARY_DIR}/Tests/GTK2Targets/gmodule"
+ --build-exe-dir "${CMake_BINARY_DIR}/Tests/FindGTK2/gmodule"
--force-new-ctest-process
--test-command ${CMAKE_CTEST_COMMAND} -V
)
@@ -55,11 +55,11 @@ endif()
if(GTK2_GTHREAD_FOUND)
add_test(GTK2Targets.gthread ${CMAKE_CTEST_COMMAND}
--build-and-test
- "${CMake_SOURCE_DIR}/Tests/GTK2Targets/gthread"
- "${CMake_BINARY_DIR}/Tests/GTK2Targets/gthread"
+ "${CMake_SOURCE_DIR}/Tests/FindGTK2/gthread"
+ "${CMake_BINARY_DIR}/Tests/FindGTK2/gthread"
${build_generator_args}
--build-project gthread
- --build-exe-dir "${CMake_BINARY_DIR}/Tests/GTK2Targets/gthread"
+ --build-exe-dir "${CMake_BINARY_DIR}/Tests/FindGTK2/gthread"
--force-new-ctest-process
--test-command ${CMAKE_CTEST_COMMAND} -V
)
@@ -68,11 +68,11 @@ endif()
if(GTK2_ATK_FOUND)
add_test(GTK2Targets.atk ${CMAKE_CTEST_COMMAND}
--build-and-test
- "${CMake_SOURCE_DIR}/Tests/GTK2Targets/atk"
- "${CMake_BINARY_DIR}/Tests/GTK2Targets/atk"
+ "${CMake_SOURCE_DIR}/Tests/FindGTK2/atk"
+ "${CMake_BINARY_DIR}/Tests/FindGTK2/atk"
${build_generator_args}
--build-project atk
- --build-exe-dir "${CMake_BINARY_DIR}/Tests/GTK2Targets/atk"
+ --build-exe-dir "${CMake_BINARY_DIR}/Tests/FindGTK2/atk"
--force-new-ctest-process
--test-command ${CMAKE_CTEST_COMMAND} -V
)
@@ -81,11 +81,11 @@ endif()
if(GTK2_GDK_PIXBUF_FOUND)
add_test(GTK2Targets.gdk_pixbuf ${CMAKE_CTEST_COMMAND}
--build-and-test
- "${CMake_SOURCE_DIR}/Tests/GTK2Targets/gdk_pixbuf"
- "${CMake_BINARY_DIR}/Tests/GTK2Targets/gdk_pixbuf"
+ "${CMake_SOURCE_DIR}/Tests/FindGTK2/gdk_pixbuf"
+ "${CMake_BINARY_DIR}/Tests/FindGTK2/gdk_pixbuf"
${build_generator_args}
--build-project gdk_pixbuf
- --build-exe-dir "${CMake_BINARY_DIR}/Tests/GTK2Targets/gdk_pixbuf"
+ --build-exe-dir "${CMake_BINARY_DIR}/Tests/FindGTK2/gdk_pixbuf"
--force-new-ctest-process
--test-command ${CMAKE_CTEST_COMMAND} -V
)
@@ -94,11 +94,11 @@ endif()
if(GTK2_CAIRO_FOUND)
add_test(GTK2Targets.cairo ${CMAKE_CTEST_COMMAND}
--build-and-test
- "${CMake_SOURCE_DIR}/Tests/GTK2Targets/cairo"
- "${CMake_BINARY_DIR}/Tests/GTK2Targets/cairo"
+ "${CMake_SOURCE_DIR}/Tests/FindGTK2/cairo"
+ "${CMake_BINARY_DIR}/Tests/FindGTK2/cairo"
${build_generator_args}
--build-project cairo
- --build-exe-dir "${CMake_BINARY_DIR}/Tests/GTK2Targets/cairo"
+ --build-exe-dir "${CMake_BINARY_DIR}/Tests/FindGTK2/cairo"
--force-new-ctest-process
--test-command ${CMAKE_CTEST_COMMAND} -V
)
@@ -107,11 +107,11 @@ endif()
if(GTK2_PANGO_FOUND)
add_test(GTK2Targets.pango ${CMAKE_CTEST_COMMAND}
--build-and-test
- "${CMake_SOURCE_DIR}/Tests/GTK2Targets/pango"
- "${CMake_BINARY_DIR}/Tests/GTK2Targets/pango"
+ "${CMake_SOURCE_DIR}/Tests/FindGTK2/pango"
+ "${CMake_BINARY_DIR}/Tests/FindGTK2/pango"
${build_generator_args}
--build-project pango
- --build-exe-dir "${CMake_BINARY_DIR}/Tests/GTK2Targets/pango"
+ --build-exe-dir "${CMake_BINARY_DIR}/Tests/FindGTK2/pango"
--force-new-ctest-process
--test-command ${CMAKE_CTEST_COMMAND} -V
)
@@ -120,11 +120,11 @@ endif()
if(GTK2_PANGOCAIRO_FOUND)
add_test(GTK2Targets.pangocairo ${CMAKE_CTEST_COMMAND}
--build-and-test
- "${CMake_SOURCE_DIR}/Tests/GTK2Targets/pangocairo"
- "${CMake_BINARY_DIR}/Tests/GTK2Targets/pangocairo"
+ "${CMake_SOURCE_DIR}/Tests/FindGTK2/pangocairo"
+ "${CMake_BINARY_DIR}/Tests/FindGTK2/pangocairo"
${build_generator_args}
--build-project pangocairo
- --build-exe-dir "${CMake_BINARY_DIR}/Tests/GTK2Targets/pangocairo"
+ --build-exe-dir "${CMake_BINARY_DIR}/Tests/FindGTK2/pangocairo"
--force-new-ctest-process
--test-command ${CMAKE_CTEST_COMMAND} -V
)
@@ -133,11 +133,11 @@ endif()
if(GTK2_PANGOXFT_FOUND)
add_test(GTK2Targets.pangoxft ${CMAKE_CTEST_COMMAND}
--build-and-test
- "${CMake_SOURCE_DIR}/Tests/GTK2Targets/pangoxft"
- "${CMake_BINARY_DIR}/Tests/GTK2Targets/pangoxft"
+ "${CMake_SOURCE_DIR}/Tests/FindGTK2/pangoxft"
+ "${CMake_BINARY_DIR}/Tests/FindGTK2/pangoxft"
${build_generator_args}
--build-project pangoxft
- --build-exe-dir "${CMake_BINARY_DIR}/Tests/GTK2Targets/pangoxft"
+ --build-exe-dir "${CMake_BINARY_DIR}/Tests/FindGTK2/pangoxft"
--force-new-ctest-process
--test-command ${CMAKE_CTEST_COMMAND} -V
)
@@ -146,11 +146,11 @@ endif()
if(GTK2_PANGOFT2_FOUND)
add_test(GTK2Targets.pangoft2 ${CMAKE_CTEST_COMMAND}
--build-and-test
- "${CMake_SOURCE_DIR}/Tests/GTK2Targets/pangoft2"
- "${CMake_BINARY_DIR}/Tests/GTK2Targets/pangoft2"
+ "${CMake_SOURCE_DIR}/Tests/FindGTK2/pangoft2"
+ "${CMake_BINARY_DIR}/Tests/FindGTK2/pangoft2"
${build_generator_args}
--build-project pangoft2
- --build-exe-dir "${CMake_BINARY_DIR}/Tests/GTK2Targets/pangoft2"
+ --build-exe-dir "${CMake_BINARY_DIR}/Tests/FindGTK2/pangoft2"
--force-new-ctest-process
--test-command ${CMAKE_CTEST_COMMAND} -V
)
@@ -159,11 +159,11 @@ endif()
if(GTK2_GDK_FOUND)
add_test(GTK2Targets.gdk ${CMAKE_CTEST_COMMAND}
--build-and-test
- "${CMake_SOURCE_DIR}/Tests/GTK2Targets/gdk"
- "${CMake_BINARY_DIR}/Tests/GTK2Targets/gdk"
+ "${CMake_SOURCE_DIR}/Tests/FindGTK2/gdk"
+ "${CMake_BINARY_DIR}/Tests/FindGTK2/gdk"
${build_generator_args}
--build-project gdk
- --build-exe-dir "${CMake_BINARY_DIR}/Tests/GTK2Targets/gdk"
+ --build-exe-dir "${CMake_BINARY_DIR}/Tests/FindGTK2/gdk"
--force-new-ctest-process
--test-command ${CMAKE_CTEST_COMMAND} -V
)
@@ -172,22 +172,22 @@ endif()
if(GTK2_GTK_FOUND)
add_test(GTK2Targets.gtk ${CMAKE_CTEST_COMMAND}
--build-and-test
- "${CMake_SOURCE_DIR}/Tests/GTK2Targets/gtk"
- "${CMake_BINARY_DIR}/Tests/GTK2Targets/gtk"
+ "${CMake_SOURCE_DIR}/Tests/FindGTK2/gtk"
+ "${CMake_BINARY_DIR}/Tests/FindGTK2/gtk"
${build_generator_args}
--build-project gtk
- --build-exe-dir "${CMake_BINARY_DIR}/Tests/GTK2Targets/gtk"
+ --build-exe-dir "${CMake_BINARY_DIR}/Tests/FindGTK2/gtk"
--force-new-ctest-process
--test-command ${CMAKE_CTEST_COMMAND} -V
)
add_test(GTK2Components.gtk ${CMAKE_CTEST_COMMAND}
--build-and-test
- "${CMake_SOURCE_DIR}/Tests/GTK2Targets/gtk"
- "${CMake_BINARY_DIR}/Tests/GTK2Targets/gtk"
+ "${CMake_SOURCE_DIR}/Tests/FindGTK2/gtk"
+ "${CMake_BINARY_DIR}/Tests/FindGTK2/gtk"
${build_generator_args}
--build-target gtk-all-libs
- --build-exe-dir "${CMake_BINARY_DIR}/Tests/GTK2Targets/gtk"
+ --build-exe-dir "${CMake_BINARY_DIR}/Tests/FindGTK2/gtk"
--force-new-ctest-process
--test-command ${CMAKE_CTEST_COMMAND} -V
)
@@ -196,11 +196,11 @@ endif()
if(GTK2_SIGC++_FOUND)
add_test(GTK2Targets.sigc++ ${CMAKE_CTEST_COMMAND}
--build-and-test
- "${CMake_SOURCE_DIR}/Tests/GTK2Targets/sigc++"
- "${CMake_BINARY_DIR}/Tests/GTK2Targets/sigc++"
+ "${CMake_SOURCE_DIR}/Tests/FindGTK2/sigc++"
+ "${CMake_BINARY_DIR}/Tests/FindGTK2/sigc++"
${build_generator_args}
--build-project sigc++
- --build-exe-dir "${CMake_BINARY_DIR}/Tests/GTK2Targets/sigc++"
+ --build-exe-dir "${CMake_BINARY_DIR}/Tests/FindGTK2/sigc++"
--force-new-ctest-process
--test-command ${CMAKE_CTEST_COMMAND} -V
)
@@ -209,11 +209,11 @@ endif()
if(GTK2_GLIBMM_FOUND)
add_test(GTK2Targets.glibmm ${CMAKE_CTEST_COMMAND}
--build-and-test
- "${CMake_SOURCE_DIR}/Tests/GTK2Targets/glibmm"
- "${CMake_BINARY_DIR}/Tests/GTK2Targets/glibmm"
+ "${CMake_SOURCE_DIR}/Tests/FindGTK2/glibmm"
+ "${CMake_BINARY_DIR}/Tests/FindGTK2/glibmm"
${build_generator_args}
--build-project glibmm
- --build-exe-dir "${CMake_BINARY_DIR}/Tests/GTK2Targets/glibmm"
+ --build-exe-dir "${CMake_BINARY_DIR}/Tests/FindGTK2/glibmm"
--force-new-ctest-process
--test-command ${CMAKE_CTEST_COMMAND} -V
)
@@ -222,11 +222,11 @@ endif()
if(GTK2_GIOMM_FOUND)
add_test(GTK2Targets.giomm ${CMAKE_CTEST_COMMAND}
--build-and-test
- "${CMake_SOURCE_DIR}/Tests/GTK2Targets/giomm"
- "${CMake_BINARY_DIR}/Tests/GTK2Targets/giomm"
+ "${CMake_SOURCE_DIR}/Tests/FindGTK2/giomm"
+ "${CMake_BINARY_DIR}/Tests/FindGTK2/giomm"
${build_generator_args}
--build-project giomm
- --build-exe-dir "${CMake_BINARY_DIR}/Tests/GTK2Targets/giomm"
+ --build-exe-dir "${CMake_BINARY_DIR}/Tests/FindGTK2/giomm"
--force-new-ctest-process
--test-command ${CMAKE_CTEST_COMMAND} -V
)
@@ -235,11 +235,11 @@ endif()
if(GTK2_ATKMM_FOUND)
add_test(GTK2Targets.atkmm ${CMAKE_CTEST_COMMAND}
--build-and-test
- "${CMake_SOURCE_DIR}/Tests/GTK2Targets/atkmm"
- "${CMake_BINARY_DIR}/Tests/GTK2Targets/atkmm"
+ "${CMake_SOURCE_DIR}/Tests/FindGTK2/atkmm"
+ "${CMake_BINARY_DIR}/Tests/FindGTK2/atkmm"
${build_generator_args}
--build-project atkmm
- --build-exe-dir "${CMake_BINARY_DIR}/Tests/GTK2Targets/atkmm"
+ --build-exe-dir "${CMake_BINARY_DIR}/Tests/FindGTK2/atkmm"
--force-new-ctest-process
--test-command ${CMAKE_CTEST_COMMAND} -V
)
@@ -248,11 +248,11 @@ endif()
if(GTK2_CAIROMM_FOUND)
add_test(GTK2Targets.cairomm ${CMAKE_CTEST_COMMAND}
--build-and-test
- "${CMake_SOURCE_DIR}/Tests/GTK2Targets/cairomm"
- "${CMake_BINARY_DIR}/Tests/GTK2Targets/cairomm"
+ "${CMake_SOURCE_DIR}/Tests/FindGTK2/cairomm"
+ "${CMake_BINARY_DIR}/Tests/FindGTK2/cairomm"
${build_generator_args}
--build-project cairomm
- --build-exe-dir "${CMake_BINARY_DIR}/Tests/GTK2Targets/cairomm"
+ --build-exe-dir "${CMake_BINARY_DIR}/Tests/FindGTK2/cairomm"
--force-new-ctest-process
--test-command ${CMAKE_CTEST_COMMAND} -V
)
@@ -261,11 +261,11 @@ endif()
if(GTK2_PANGOMM_FOUND)
add_test(GTK2Targets.pangomm ${CMAKE_CTEST_COMMAND}
--build-and-test
- "${CMake_SOURCE_DIR}/Tests/GTK2Targets/pangomm"
- "${CMake_BINARY_DIR}/Tests/GTK2Targets/pangomm"
+ "${CMake_SOURCE_DIR}/Tests/FindGTK2/pangomm"
+ "${CMake_BINARY_DIR}/Tests/FindGTK2/pangomm"
${build_generator_args}
--build-project pangomm
- --build-exe-dir "${CMake_BINARY_DIR}/Tests/GTK2Targets/pangomm"
+ --build-exe-dir "${CMake_BINARY_DIR}/Tests/FindGTK2/pangomm"
--force-new-ctest-process
--test-command ${CMAKE_CTEST_COMMAND} -V
)
@@ -274,11 +274,11 @@ endif()
if(GTK2_GDKMM_FOUND)
add_test(GTK2Targets.gdkmm ${CMAKE_CTEST_COMMAND}
--build-and-test
- "${CMake_SOURCE_DIR}/Tests/GTK2Targets/gdkmm"
- "${CMake_BINARY_DIR}/Tests/GTK2Targets/gdkmm"
+ "${CMake_SOURCE_DIR}/Tests/FindGTK2/gdkmm"
+ "${CMake_BINARY_DIR}/Tests/FindGTK2/gdkmm"
${build_generator_args}
--build-project gdkmm
- --build-exe-dir "${CMake_BINARY_DIR}/Tests/GTK2Targets/gdkmm"
+ --build-exe-dir "${CMake_BINARY_DIR}/Tests/FindGTK2/gdkmm"
--force-new-ctest-process
--test-command ${CMAKE_CTEST_COMMAND} -V
)
@@ -287,22 +287,22 @@ endif()
if(GTK2_GTKMM_FOUND)
add_test(GTK2Targets.gtkmm ${CMAKE_CTEST_COMMAND}
--build-and-test
- "${CMake_SOURCE_DIR}/Tests/GTK2Targets/gtkmm"
- "${CMake_BINARY_DIR}/Tests/GTK2Targets/gtkmm"
+ "${CMake_SOURCE_DIR}/Tests/FindGTK2/gtkmm"
+ "${CMake_BINARY_DIR}/Tests/FindGTK2/gtkmm"
${build_generator_args}
--build-target gtkmm-target
- --build-exe-dir "${CMake_BINARY_DIR}/Tests/GTK2Targets/gtkmm"
+ --build-exe-dir "${CMake_BINARY_DIR}/Tests/FindGTK2/gtkmm"
--force-new-ctest-process
--test-command ${CMAKE_CTEST_COMMAND} -V
)
add_test(GTK2Components.gtkmm ${CMAKE_CTEST_COMMAND}
--build-and-test
- "${CMake_SOURCE_DIR}/Tests/GTK2Targets/gtkmm"
- "${CMake_BINARY_DIR}/Tests/GTK2Targets/gtkmm"
+ "${CMake_SOURCE_DIR}/Tests/FindGTK2/gtkmm"
+ "${CMake_BINARY_DIR}/Tests/FindGTK2/gtkmm"
${build_generator_args}
--build-target gtkmm-all-libs
- --build-exe-dir "${CMake_BINARY_DIR}/Tests/GTK2Targets/gtkmm"
+ --build-exe-dir "${CMake_BINARY_DIR}/Tests/FindGTK2/gtkmm"
--force-new-ctest-process
--test-command ${CMAKE_CTEST_COMMAND} -V
)
diff --git a/Tests/GTK2Targets/atk/CMakeLists.txt b/Tests/FindGTK2/atk/CMakeLists.txt
similarity index 100%
rename from Tests/GTK2Targets/atk/CMakeLists.txt
rename to Tests/FindGTK2/atk/CMakeLists.txt
diff --git a/Tests/GTK2Targets/atk/main.c b/Tests/FindGTK2/atk/main.c
similarity index 100%
rename from Tests/GTK2Targets/atk/main.c
rename to Tests/FindGTK2/atk/main.c
diff --git a/Tests/GTK2Targets/atkmm/CMakeLists.txt b/Tests/FindGTK2/atkmm/CMakeLists.txt
similarity index 100%
rename from Tests/GTK2Targets/atkmm/CMakeLists.txt
rename to Tests/FindGTK2/atkmm/CMakeLists.txt
diff --git a/Tests/GTK2Targets/atkmm/main.cpp b/Tests/FindGTK2/atkmm/main.cpp
similarity index 100%
rename from Tests/GTK2Targets/atkmm/main.cpp
rename to Tests/FindGTK2/atkmm/main.cpp
diff --git a/Tests/GTK2Targets/cairo/CMakeLists.txt b/Tests/FindGTK2/cairo/CMakeLists.txt
similarity index 100%
rename from Tests/GTK2Targets/cairo/CMakeLists.txt
rename to Tests/FindGTK2/cairo/CMakeLists.txt
diff --git a/Tests/GTK2Targets/cairo/main.c b/Tests/FindGTK2/cairo/main.c
similarity index 100%
rename from Tests/GTK2Targets/cairo/main.c
rename to Tests/FindGTK2/cairo/main.c
diff --git a/Tests/GTK2Targets/cairomm/CMakeLists.txt b/Tests/FindGTK2/cairomm/CMakeLists.txt
similarity index 100%
rename from Tests/GTK2Targets/cairomm/CMakeLists.txt
rename to Tests/FindGTK2/cairomm/CMakeLists.txt
diff --git a/Tests/GTK2Targets/cairomm/main.cpp b/Tests/FindGTK2/cairomm/main.cpp
similarity index 100%
rename from Tests/GTK2Targets/cairomm/main.cpp
rename to Tests/FindGTK2/cairomm/main.cpp
diff --git a/Tests/GTK2Targets/gdk/CMakeLists.txt b/Tests/FindGTK2/gdk/CMakeLists.txt
similarity index 100%
rename from Tests/GTK2Targets/gdk/CMakeLists.txt
rename to Tests/FindGTK2/gdk/CMakeLists.txt
diff --git a/Tests/GTK2Targets/gdk/main.c b/Tests/FindGTK2/gdk/main.c
similarity index 100%
rename from Tests/GTK2Targets/gdk/main.c
rename to Tests/FindGTK2/gdk/main.c
diff --git a/Tests/GTK2Targets/gdk_pixbuf/CMakeLists.txt b/Tests/FindGTK2/gdk_pixbuf/CMakeLists.txt
similarity index 100%
rename from Tests/GTK2Targets/gdk_pixbuf/CMakeLists.txt
rename to Tests/FindGTK2/gdk_pixbuf/CMakeLists.txt
diff --git a/Tests/GTK2Targets/gdk_pixbuf/main.c b/Tests/FindGTK2/gdk_pixbuf/main.c
similarity index 100%
rename from Tests/GTK2Targets/gdk_pixbuf/main.c
rename to Tests/FindGTK2/gdk_pixbuf/main.c
diff --git a/Tests/GTK2Targets/gdkmm/CMakeLists.txt b/Tests/FindGTK2/gdkmm/CMakeLists.txt
similarity index 100%
rename from Tests/GTK2Targets/gdkmm/CMakeLists.txt
rename to Tests/FindGTK2/gdkmm/CMakeLists.txt
diff --git a/Tests/GTK2Targets/gdkmm/main.cpp b/Tests/FindGTK2/gdkmm/main.cpp
similarity index 100%
rename from Tests/GTK2Targets/gdkmm/main.cpp
rename to Tests/FindGTK2/gdkmm/main.cpp
diff --git a/Tests/GTK2Targets/gio/CMakeLists.txt b/Tests/FindGTK2/gio/CMakeLists.txt
similarity index 100%
rename from Tests/GTK2Targets/gio/CMakeLists.txt
rename to Tests/FindGTK2/gio/CMakeLists.txt
diff --git a/Tests/GTK2Targets/gio/main.c b/Tests/FindGTK2/gio/main.c
similarity index 100%
rename from Tests/GTK2Targets/gio/main.c
rename to Tests/FindGTK2/gio/main.c
diff --git a/Tests/GTK2Targets/giomm/CMakeLists.txt b/Tests/FindGTK2/giomm/CMakeLists.txt
similarity index 100%
rename from Tests/GTK2Targets/giomm/CMakeLists.txt
rename to Tests/FindGTK2/giomm/CMakeLists.txt
diff --git a/Tests/GTK2Targets/giomm/main.cpp b/Tests/FindGTK2/giomm/main.cpp
similarity index 100%
rename from Tests/GTK2Targets/giomm/main.cpp
rename to Tests/FindGTK2/giomm/main.cpp
diff --git a/Tests/GTK2Targets/glib/CMakeLists.txt b/Tests/FindGTK2/glib/CMakeLists.txt
similarity index 100%
rename from Tests/GTK2Targets/glib/CMakeLists.txt
rename to Tests/FindGTK2/glib/CMakeLists.txt
diff --git a/Tests/GTK2Targets/glib/main.c b/Tests/FindGTK2/glib/main.c
similarity index 100%
rename from Tests/GTK2Targets/glib/main.c
rename to Tests/FindGTK2/glib/main.c
diff --git a/Tests/GTK2Targets/glibmm/CMakeLists.txt b/Tests/FindGTK2/glibmm/CMakeLists.txt
similarity index 100%
rename from Tests/GTK2Targets/glibmm/CMakeLists.txt
rename to Tests/FindGTK2/glibmm/CMakeLists.txt
diff --git a/Tests/GTK2Targets/glibmm/main.cpp b/Tests/FindGTK2/glibmm/main.cpp
similarity index 100%
rename from Tests/GTK2Targets/glibmm/main.cpp
rename to Tests/FindGTK2/glibmm/main.cpp
diff --git a/Tests/GTK2Targets/gmodule/CMakeLists.txt b/Tests/FindGTK2/gmodule/CMakeLists.txt
similarity index 100%
rename from Tests/GTK2Targets/gmodule/CMakeLists.txt
rename to Tests/FindGTK2/gmodule/CMakeLists.txt
diff --git a/Tests/GTK2Targets/gmodule/main.c b/Tests/FindGTK2/gmodule/main.c
similarity index 100%
rename from Tests/GTK2Targets/gmodule/main.c
rename to Tests/FindGTK2/gmodule/main.c
diff --git a/Tests/GTK2Targets/gobject/CMakeLists.txt b/Tests/FindGTK2/gobject/CMakeLists.txt
similarity index 100%
rename from Tests/GTK2Targets/gobject/CMakeLists.txt
rename to Tests/FindGTK2/gobject/CMakeLists.txt
diff --git a/Tests/GTK2Targets/gobject/main.c b/Tests/FindGTK2/gobject/main.c
similarity index 100%
rename from Tests/GTK2Targets/gobject/main.c
rename to Tests/FindGTK2/gobject/main.c
diff --git a/Tests/GTK2Targets/gthread/CMakeLists.txt b/Tests/FindGTK2/gthread/CMakeLists.txt
similarity index 100%
rename from Tests/GTK2Targets/gthread/CMakeLists.txt
rename to Tests/FindGTK2/gthread/CMakeLists.txt
diff --git a/Tests/GTK2Targets/gthread/main.c b/Tests/FindGTK2/gthread/main.c
similarity index 100%
rename from Tests/GTK2Targets/gthread/main.c
rename to Tests/FindGTK2/gthread/main.c
diff --git a/Tests/GTK2Targets/gtk/CMakeLists.txt b/Tests/FindGTK2/gtk/CMakeLists.txt
similarity index 100%
rename from Tests/GTK2Targets/gtk/CMakeLists.txt
rename to Tests/FindGTK2/gtk/CMakeLists.txt
diff --git a/Tests/GTK2Targets/gtk/main.c b/Tests/FindGTK2/gtk/main.c
similarity index 100%
rename from Tests/GTK2Targets/gtk/main.c
rename to Tests/FindGTK2/gtk/main.c
diff --git a/Tests/GTK2Targets/gtkmm/CMakeLists.txt b/Tests/FindGTK2/gtkmm/CMakeLists.txt
similarity index 100%
rename from Tests/GTK2Targets/gtkmm/CMakeLists.txt
rename to Tests/FindGTK2/gtkmm/CMakeLists.txt
diff --git a/Tests/GTK2Targets/gtkmm/helloworld.cpp b/Tests/FindGTK2/gtkmm/helloworld.cpp
similarity index 100%
rename from Tests/GTK2Targets/gtkmm/helloworld.cpp
rename to Tests/FindGTK2/gtkmm/helloworld.cpp
diff --git a/Tests/GTK2Targets/gtkmm/helloworld.h b/Tests/FindGTK2/gtkmm/helloworld.h
similarity index 100%
rename from Tests/GTK2Targets/gtkmm/helloworld.h
rename to Tests/FindGTK2/gtkmm/helloworld.h
diff --git a/Tests/GTK2Targets/gtkmm/main.cpp b/Tests/FindGTK2/gtkmm/main.cpp
similarity index 100%
rename from Tests/GTK2Targets/gtkmm/main.cpp
rename to Tests/FindGTK2/gtkmm/main.cpp
diff --git a/Tests/GTK2Targets/pango/CMakeLists.txt b/Tests/FindGTK2/pango/CMakeLists.txt
similarity index 100%
rename from Tests/GTK2Targets/pango/CMakeLists.txt
rename to Tests/FindGTK2/pango/CMakeLists.txt
diff --git a/Tests/GTK2Targets/pango/main.c b/Tests/FindGTK2/pango/main.c
similarity index 100%
rename from Tests/GTK2Targets/pango/main.c
rename to Tests/FindGTK2/pango/main.c
diff --git a/Tests/GTK2Targets/pangocairo/CMakeLists.txt b/Tests/FindGTK2/pangocairo/CMakeLists.txt
similarity index 100%
rename from Tests/GTK2Targets/pangocairo/CMakeLists.txt
rename to Tests/FindGTK2/pangocairo/CMakeLists.txt
diff --git a/Tests/GTK2Targets/pangocairo/main.c b/Tests/FindGTK2/pangocairo/main.c
similarity index 100%
rename from Tests/GTK2Targets/pangocairo/main.c
rename to Tests/FindGTK2/pangocairo/main.c
diff --git a/Tests/GTK2Targets/pangoft2/CMakeLists.txt b/Tests/FindGTK2/pangoft2/CMakeLists.txt
similarity index 100%
rename from Tests/GTK2Targets/pangoft2/CMakeLists.txt
rename to Tests/FindGTK2/pangoft2/CMakeLists.txt
diff --git a/Tests/GTK2Targets/pangoft2/main.c b/Tests/FindGTK2/pangoft2/main.c
similarity index 100%
rename from Tests/GTK2Targets/pangoft2/main.c
rename to Tests/FindGTK2/pangoft2/main.c
diff --git a/Tests/GTK2Targets/pangomm/CMakeLists.txt b/Tests/FindGTK2/pangomm/CMakeLists.txt
similarity index 100%
rename from Tests/GTK2Targets/pangomm/CMakeLists.txt
rename to Tests/FindGTK2/pangomm/CMakeLists.txt
diff --git a/Tests/GTK2Targets/pangomm/main.cpp b/Tests/FindGTK2/pangomm/main.cpp
similarity index 100%
rename from Tests/GTK2Targets/pangomm/main.cpp
rename to Tests/FindGTK2/pangomm/main.cpp
diff --git a/Tests/GTK2Targets/pangoxft/CMakeLists.txt b/Tests/FindGTK2/pangoxft/CMakeLists.txt
similarity index 100%
rename from Tests/GTK2Targets/pangoxft/CMakeLists.txt
rename to Tests/FindGTK2/pangoxft/CMakeLists.txt
diff --git a/Tests/GTK2Targets/pangoxft/main.c b/Tests/FindGTK2/pangoxft/main.c
similarity index 100%
rename from Tests/GTK2Targets/pangoxft/main.c
rename to Tests/FindGTK2/pangoxft/main.c
diff --git a/Tests/GTK2Targets/sigc++/CMakeLists.txt b/Tests/FindGTK2/sigc++/CMakeLists.txt
similarity index 100%
rename from Tests/GTK2Targets/sigc++/CMakeLists.txt
rename to Tests/FindGTK2/sigc++/CMakeLists.txt
diff --git a/Tests/GTK2Targets/sigc++/main.cpp b/Tests/FindGTK2/sigc++/main.cpp
similarity index 100%
rename from Tests/GTK2Targets/sigc++/main.cpp
rename to Tests/FindGTK2/sigc++/main.cpp
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cecc70aa3a932f98a95851182661457ef92e2c9f
commit cecc70aa3a932f98a95851182661457ef92e2c9f
Author: Daniele E. Domenichelli <daniele.domenichelli at iit.it>
AuthorDate: Fri Sep 6 14:59:42 2013 +0200
Commit: Daniele E. Domenichelli <daniele.domenichelli at iit.it>
CommitDate: Fri Sep 6 15:53:37 2013 +0200
FindGTK2: Add test for components using variables
Use GTK2_LIBRARIES and GTK2_INCLUDE_DIRS variables
diff --git a/Tests/GTK2Targets/CMakeLists.txt b/Tests/GTK2Targets/CMakeLists.txt
index ada25ec..154ff92 100644
--- a/Tests/GTK2Targets/CMakeLists.txt
+++ b/Tests/GTK2Targets/CMakeLists.txt
@@ -180,6 +180,17 @@ if(GTK2_GTK_FOUND)
--force-new-ctest-process
--test-command ${CMAKE_CTEST_COMMAND} -V
)
+
+ add_test(GTK2Components.gtk ${CMAKE_CTEST_COMMAND}
+ --build-and-test
+ "${CMake_SOURCE_DIR}/Tests/GTK2Targets/gtk"
+ "${CMake_BINARY_DIR}/Tests/GTK2Targets/gtk"
+ ${build_generator_args}
+ --build-target gtk-all-libs
+ --build-exe-dir "${CMake_BINARY_DIR}/Tests/GTK2Targets/gtk"
+ --force-new-ctest-process
+ --test-command ${CMAKE_CTEST_COMMAND} -V
+ )
endif()
if(GTK2_SIGC++_FOUND)
@@ -279,7 +290,18 @@ if(GTK2_GTKMM_FOUND)
"${CMake_SOURCE_DIR}/Tests/GTK2Targets/gtkmm"
"${CMake_BINARY_DIR}/Tests/GTK2Targets/gtkmm"
${build_generator_args}
- --build-project gtkmm
+ --build-target gtkmm-target
+ --build-exe-dir "${CMake_BINARY_DIR}/Tests/GTK2Targets/gtkmm"
+ --force-new-ctest-process
+ --test-command ${CMAKE_CTEST_COMMAND} -V
+ )
+
+ add_test(GTK2Components.gtkmm ${CMAKE_CTEST_COMMAND}
+ --build-and-test
+ "${CMake_SOURCE_DIR}/Tests/GTK2Targets/gtkmm"
+ "${CMake_BINARY_DIR}/Tests/GTK2Targets/gtkmm"
+ ${build_generator_args}
+ --build-target gtkmm-all-libs
--build-exe-dir "${CMake_BINARY_DIR}/Tests/GTK2Targets/gtkmm"
--force-new-ctest-process
--test-command ${CMAKE_CTEST_COMMAND} -V
diff --git a/Tests/GTK2Targets/gtk/CMakeLists.txt b/Tests/GTK2Targets/gtk/CMakeLists.txt
index 31d36e3..08956b0 100644
--- a/Tests/GTK2Targets/gtk/CMakeLists.txt
+++ b/Tests/GTK2Targets/gtk/CMakeLists.txt
@@ -8,3 +8,7 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON)
add_executable(gtk WIN32 main.c)
target_link_libraries(gtk GTK2::gtk)
+
+add_executable(gtk-all-libs WIN32 main.c)
+target_link_libraries(gtk-all-libs ${GTK2_LIBRARIES})
+target_include_directories(gtk-all-libs PRIVATE ${GTK2_INCLUDE_DIRS})
diff --git a/Tests/GTK2Targets/gtkmm/CMakeLists.txt b/Tests/GTK2Targets/gtkmm/CMakeLists.txt
index b577913..3def73b 100644
--- a/Tests/GTK2Targets/gtkmm/CMakeLists.txt
+++ b/Tests/GTK2Targets/gtkmm/CMakeLists.txt
@@ -6,5 +6,9 @@ find_package(GTK2 COMPONENTS gtk gtkmm REQUIRED)
set(CMAKE_INCLUDE_CURRENT_DIR ON)
-add_executable(gtkmm WIN32 main.cpp helloworld.cpp helloworld.h)
-target_link_libraries(gtkmm GTK2::gtkmm)
+add_executable(gtkmm-target WIN32 main.cpp helloworld.cpp helloworld.h)
+target_link_libraries(gtkmm-target GTK2::gtkmm)
+
+add_executable(gtkmm-all-libs WIN32 main.cpp helloworld.cpp helloworld.h)
+target_link_libraries(gtkmm-all-libs ${GTK2_LIBRARIES})
+target_include_directories(gtkmm-all-libs PRIVATE ${GTK2_INCLUDE_DIRS})
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f9249f6871b37ab512b1a02135a6707784e151ec
commit f9249f6871b37ab512b1a02135a6707784e151ec
Author: Daniele E. Domenichelli <daniele.domenichelli at iit.it>
AuthorDate: Tue Sep 3 15:04:32 2013 +0200
Commit: Daniele E. Domenichelli <daniele.domenichelli at iit.it>
CommitDate: Fri Sep 6 14:57:52 2013 +0200
FindGTK2: Do not link libfreetype
As discussed on the mailing list, freetype includes used in GTK2
headers libraries do not require to link the library explicitly (even
though it is already linked by GTK2 libraries.
Also remove _GTK2_ADD_TARGET_LIBRARIES no longer used and use
${FREETYPE_INCLUDE_DIR_ft2build} ${FREETYPE_INCLUDE_DIR_freetype2}
variables instead of ${FREETYPE_INCLUDE_DIRS}
diff --git a/Modules/FindGTK2.cmake b/Modules/FindGTK2.cmake
index 635b965..6140be9 100644
--- a/Modules/FindGTK2.cmake
+++ b/Modules/FindGTK2.cmake
@@ -66,7 +66,10 @@
# (To distribute this file outside of CMake, substitute the full
# License text for the above reference.)
-# Version 1.5 (UNRELEASED) (CMake 2.8.12)
+# Version 1.6 (CMake 2.8.13)
+# * Create targets for each library
+# * Do not link libfreetype
+# Version 1.5 (CMake 2.8.12)
# * 14236: Detect gthread library
# Detect pangocairo on windows
# Detect pangocairo with gtk module instead of with gtkmm
@@ -78,7 +81,6 @@
# * Remove GTK2_SKIP_MARK_AS_ADVANCED option, as now the variables are
# marked as advanced by SelectLibraryConfigurations
# * Detect gmodule, pangoft2 and pangoxft libraries
-# * Create targets for each library.
# Version 1.4 (10/4/2012) (CMake 2.8.10)
# * 12596: Missing paths for FindGTK2 on NetBSD
# * 12049: Fixed detection of GTK include files in the lib folder on
@@ -481,22 +483,6 @@ function(_GTK2_ADD_TARGET_INCLUDE_DIRS _var)
endif()
endfunction()
-function(_GTK2_ADD_TARGET_LIBRARIES _var)
- if(GTK2_DEBUG)
- message(STATUS "[FindGTK2.cmake:${CMAKE_CURRENT_LIST_LINE}] "
- "_GTK2_ADD_TARGET_LIBRARIES( ${_var} )")
- endif()
-
- string(TOLOWER "${_var}" _basename)
-
- if(TARGET GTK2::${_basename})
- set_property(TARGET GTK2::${_basename} APPEND PROPERTY INTERFACE_LINK_LIBRARIES "${ARGN}")
- foreach(_library ${ARGN})
- set_property(TARGET GTK2::${_basename} APPEND PROPERTY IMPORTED_LINK_INTERFACE_LIBRARIES_$ "${_library}")
- endforeach()
- endif()
-endfunction()
-
#=============================================================
#
@@ -582,8 +568,7 @@ endif()
#
find_package(Freetype)
-list(APPEND GTK2_INCLUDE_DIRS ${FREETYPE_INCLUDE_DIRS})
-list(APPEND GTK2_LIBRARIES ${FREETYPE_LIBRARIES})
+list(APPEND GTK2_INCLUDE_DIRS ${FREETYPE_INCLUDE_DIR_ft2build} ${FREETYPE_INCLUDE_DIR_freetype2})
foreach(_GTK2_component ${GTK2_FIND_COMPONENTS})
if(_GTK2_component STREQUAL "gtk")
@@ -655,16 +640,13 @@ foreach(_GTK2_component ${GTK2_FIND_COMPONENTS})
_GTK2_ADD_TARGET_DEPENDS(GTHREAD glib)
_GTK2_ADD_TARGET_DEPENDS(GMODULE glib)
_GTK2_ADD_TARGET_DEPENDS(GDK_PIXBUF gobject glib)
- _GTK2_ADD_TARGET_INCLUDE_DIRS(CAIRO ${FREETYPE_INCLUDE_DIRS} ${GTK2_FONTCONFIG_INCLUDE_DIRS})
- _GTK2_ADD_TARGET_LIBRARIES(CAIRO ${FREETYPE_LIBRARIES})
+ _GTK2_ADD_TARGET_INCLUDE_DIRS(CAIRO ${FREETYPE_INCLUDE_DIR_ft2build} ${FREETYPE_INCLUDE_DIR_freetype2} ${GTK2_FONTCONFIG_INCLUDE_DIRS})
_GTK2_ADD_TARGET_DEPENDS(PANGO gobject glib)
_GTK2_ADD_TARGET_DEPENDS(PANGOCAIRO pango cairo gobject glib)
_GTK2_ADD_TARGET_DEPENDS(PANGOFT2 pango gobject glib)
- _GTK2_ADD_TARGET_INCLUDE_DIRS(PANGOFT2 ${FREETYPE_INCLUDE_DIRS} ${GTK2_FONTCONFIG_INCLUDE_DIRS})
- _GTK2_ADD_TARGET_LIBRARIES(PANGOFT2 ${FREETYPE_LIBRARIES})
+ _GTK2_ADD_TARGET_INCLUDE_DIRS(PANGOFT2 ${FREETYPE_INCLUDE_DIR_ft2build} ${FREETYPE_INCLUDE_DIR_freetype2} ${GTK2_FONTCONFIG_INCLUDE_DIRS})
_GTK2_ADD_TARGET_DEPENDS(PANGOXFT pangoft2 pango gobject glib)
- _GTK2_ADD_TARGET_INCLUDE_DIRS(PANGOXFT ${FREETYPE_INCLUDE_DIRS} ${GTK2_FONTCONFIG_INCLUDE_DIRS})
- _GTK2_ADD_TARGET_LIBRARIES(PANGOXFT ${FREETYPE_LIBRARIES})
+ _GTK2_ADD_TARGET_INCLUDE_DIRS(PANGOXFT ${FREETYPE_INCLUDE_DIR_ft2build} ${FREETYPE_INCLUDE_DIR_freetype2} ${GTK2_FONTCONFIG_INCLUDE_DIRS})
_GTK2_ADD_TARGET_DEPENDS(GDK pangocairo pango cairo gdk_pixbuf gobject glib)
_GTK2_ADD_TARGET_DEPENDS(GTK gdk atk gio pangoft2 pangocairo pango cairo gdk_pixbuf gthread gobject glib)
@@ -715,11 +697,9 @@ foreach(_GTK2_component ${GTK2_FIND_COMPONENTS})
_GTK2_ADD_TARGET_DEPENDS(CAIROMM cairo sigc++)
_GTK2_ADD_TARGET_DEPENDS(PANGOMM glibmm cairomm pangocairo sigc++ pango cairo gobject glib)
_GTK2_ADD_TARGET_DEPENDS(GDKMM giomm pangomm gtk glibmm cairomm sigc++ gdk atk gio pangoft2 pangocairo gdk_pixbuf cairo pango gobject glib)
- _GTK2_ADD_TARGET_INCLUDE_DIRS(GDKMM ${FREETYPE_INCLUDE_DIRS} ${GTK2_FONTCONFIG_INCLUDE_DIRS})
- _GTK2_ADD_TARGET_LIBRARIES(GDKMM ${FREETYPE_LIBRARIES})
+ _GTK2_ADD_TARGET_INCLUDE_DIRS(GDKMM ${FREETYPE_INCLUDE_DIR_ft2build} ${FREETYPE_INCLUDE_DIR_freetype2} ${GTK2_FONTCONFIG_INCLUDE_DIRS})
_GTK2_ADD_TARGET_DEPENDS(GTKMM atkmm gdkmm giomm pangomm gtk glibmm cairomm sigc++ gdk atk gio pangoft2 pangocairo gdk_pixbuf cairo pango gthread gobject glib)
- _GTK2_ADD_TARGET_INCLUDE_DIRS(GTKMM ${FREETYPE_INCLUDE_DIRS} ${GTK2_FONTCONFIG_INCLUDE_DIRS})
- _GTK2_ADD_TARGET_LIBRARIES(GTKMM ${FREETYPE_LIBRARIES})
+ _GTK2_ADD_TARGET_INCLUDE_DIRS(GTKMM ${FREETYPE_INCLUDE_DIR_ft2build} ${FREETYPE_INCLUDE_DIR_freetype2} ${GTK2_FONTCONFIG_INCLUDE_DIRS})
elseif(_GTK2_component STREQUAL "glade")
@@ -727,8 +707,7 @@ foreach(_GTK2_component ${GTK2_FIND_COMPONENTS})
_GTK2_FIND_LIBRARY (GLADE glade false true)
_GTK2_ADJUST_LIB_VARS (GLADE)
_GTK2_ADD_TARGET_DEPENDS(GLADE gtk gdk atk gio pangoft2 pangocairo gdk_pixbuf cairo pango gobject glib)
- _GTK2_ADD_TARGET_INCLUDE_DIRS(GLADE ${FREETYPE_INCLUDE_DIRS} ${GTK2_FONTCONFIG_INCLUDE_DIRS})
- _GTK2_ADD_TARGET_LIBRARIES(GLADE ${FREETYPE_LIBRARIES})
+ _GTK2_ADD_TARGET_INCLUDE_DIRS(GLADE ${FREETYPE_INCLUDE_DIR_ft2build} ${FREETYPE_INCLUDE_DIR_freetype2} ${GTK2_FONTCONFIG_INCLUDE_DIRS})
elseif(_GTK2_component STREQUAL "glademm")
@@ -737,8 +716,7 @@ foreach(_GTK2_component ${GTK2_FIND_COMPONENTS})
_GTK2_FIND_LIBRARY (GLADEMM glademm true true)
_GTK2_ADJUST_LIB_VARS (GLADEMM)
_GTK2_ADD_TARGET_DEPENDS(GLADEMM gtkmm glade atkmm gdkmm giomm pangomm glibmm cairomm sigc++ gtk gdk atk gio pangoft pangocairo gdk_pixbuf cairo pango gthread gobject glib)
- _GTK2_ADD_TARGET_INCLUDE_DIRS(GLADEMM ${FREETYPE_INCLUDE_DIRS} ${GTK2_FONTCONFIG_INCLUDE_DIRS})
- _GTK2_ADD_TARGET_LIBRARIES(GLADEMM ${FREETYPE_LIBRARIES})
+ _GTK2_ADD_TARGET_INCLUDE_DIRS(GLADEMM ${FREETYPE_INCLUDE_DIR_ft2build} ${FREETYPE_INCLUDE_DIR_freetype2} ${GTK2_FONTCONFIG_INCLUDE_DIRS})
else()
message(FATAL_ERROR "Unknown GTK2 component ${_component}")
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e71ebb6e13a06a9d068a04263c2a645474dc1fe8
commit e71ebb6e13a06a9d068a04263c2a645474dc1fe8
Author: Daniele E. Domenichelli <daniele.domenichelli at iit.it>
AuthorDate: Wed Aug 14 10:48:44 2013 +0200
Commit: Daniele E. Domenichelli <daniele.domenichelli at iit.it>
CommitDate: Wed Aug 14 10:48:44 2013 +0200
FindGTK2: Add config directories only if different from include ones
diff --git a/Modules/FindGTK2.cmake b/Modules/FindGTK2.cmake
index 5f7e0a7..635b965 100644
--- a/Modules/FindGTK2.cmake
+++ b/Modules/FindGTK2.cmake
@@ -413,7 +413,7 @@ function(_GTK2_ADJUST_LIB_VARS _var)
set_property(TARGET GTK2::${_basename} APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES "${GTK2_${_var}_INCLUDE_DIR}")
endif()
- if(GTK2_${_var}CONFIG_INCLUDE_DIR)
+ if(GTK2_${_var}CONFIG_INCLUDE_DIR AND NOT "${GTK2_${_var}CONFIG_INCLUDE_DIR}" STREQUAL "GTK2_${_var}_INCLUDE_DIR")
set_property(TARGET GTK2::${_basename} APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES "${GTK2_${_var}CONFIG_INCLUDE_DIR}")
endif()
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a8b190b3dd00628adfc5e050d78239a399bfb3c7
commit a8b190b3dd00628adfc5e050d78239a399bfb3c7
Author: Daniele E. Domenichelli <daniele.domenichelli at iit.it>
AuthorDate: Wed Aug 14 10:46:42 2013 +0200
Commit: Daniele E. Domenichelli <daniele.domenichelli at iit.it>
CommitDate: Wed Aug 14 10:46:42 2013 +0200
FindGTK2: Set INTERFACE_COMPILE_DEFINITIONS target property only if not empty
diff --git a/Modules/FindGTK2.cmake b/Modules/FindGTK2.cmake
index 20b90b5..5f7e0a7 100644
--- a/Modules/FindGTK2.cmake
+++ b/Modules/FindGTK2.cmake
@@ -417,7 +417,9 @@ function(_GTK2_ADJUST_LIB_VARS _var)
set_property(TARGET GTK2::${_basename} APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES "${GTK2_${_var}CONFIG_INCLUDE_DIR}")
endif()
- set_property(TARGET GTK2::${_basename} PROPERTY INTERFACE_COMPILE_DEFINITIONS "${GTK2_DEFINITIONS}")
+ if(GTK2_DEFINITIONS)
+ set_property(TARGET GTK2::${_basename} PROPERTY INTERFACE_COMPILE_DEFINITIONS "${GTK2_DEFINITIONS}")
+ endif()
if(GTK2_USE_IMPORTED_TARGETS)
set(GTK2_${_var}_LIBRARY GTK2::${_basename} PARENT_SCOPE)
-----------------------------------------------------------------------
Summary of changes:
Modules/FindGTK2.cmake | 52 ++-----
Tests/CMakeLists.txt | 2 +-
Tests/{GTK2Targets => FindGTK2}/CMakeLists.txt | 156 +++++++++++---------
Tests/{GTK2Targets => FindGTK2}/atk/CMakeLists.txt | 0
Tests/{GTK2Targets => FindGTK2}/atk/main.c | 0
.../{GTK2Targets => FindGTK2}/atkmm/CMakeLists.txt | 0
Tests/{GTK2Targets => FindGTK2}/atkmm/main.cpp | 0
.../{GTK2Targets => FindGTK2}/cairo/CMakeLists.txt | 0
Tests/{GTK2Targets => FindGTK2}/cairo/main.c | 0
.../cairomm/CMakeLists.txt | 0
Tests/{GTK2Targets => FindGTK2}/cairomm/main.cpp | 0
Tests/{GTK2Targets => FindGTK2}/gdk/CMakeLists.txt | 0
Tests/{GTK2Targets => FindGTK2}/gdk/main.c | 0
.../gdk_pixbuf/CMakeLists.txt | 0
Tests/{GTK2Targets => FindGTK2}/gdk_pixbuf/main.c | 0
.../{GTK2Targets => FindGTK2}/gdkmm/CMakeLists.txt | 0
Tests/{GTK2Targets => FindGTK2}/gdkmm/main.cpp | 0
Tests/{GTK2Targets => FindGTK2}/gio/CMakeLists.txt | 0
Tests/{GTK2Targets => FindGTK2}/gio/main.c | 0
.../{GTK2Targets => FindGTK2}/giomm/CMakeLists.txt | 0
Tests/{GTK2Targets => FindGTK2}/giomm/main.cpp | 0
.../{GTK2Targets => FindGTK2}/glib/CMakeLists.txt | 0
Tests/{GTK2Targets => FindGTK2}/glib/main.c | 0
.../glibmm/CMakeLists.txt | 0
Tests/{GTK2Targets => FindGTK2}/glibmm/main.cpp | 0
.../gmodule/CMakeLists.txt | 0
Tests/{GTK2Targets => FindGTK2}/gmodule/main.c | 0
.../gobject/CMakeLists.txt | 0
Tests/{GTK2Targets => FindGTK2}/gobject/main.c | 0
.../gthread/CMakeLists.txt | 0
Tests/{GTK2Targets => FindGTK2}/gthread/main.c | 0
Tests/FindGTK2/gtk/CMakeLists.txt | 14 ++
Tests/{GTK2Targets => FindGTK2}/gtk/main.c | 0
Tests/FindGTK2/gtkmm/CMakeLists.txt | 14 ++
.../{GTK2Targets => FindGTK2}/gtkmm/helloworld.cpp | 0
Tests/{GTK2Targets => FindGTK2}/gtkmm/helloworld.h | 0
Tests/{GTK2Targets => FindGTK2}/gtkmm/main.cpp | 0
.../{GTK2Targets => FindGTK2}/pango/CMakeLists.txt | 0
Tests/{GTK2Targets => FindGTK2}/pango/main.c | 0
.../pangocairo/CMakeLists.txt | 0
Tests/{GTK2Targets => FindGTK2}/pangocairo/main.c | 0
.../pangoft2/CMakeLists.txt | 0
Tests/{GTK2Targets => FindGTK2}/pangoft2/main.c | 0
.../pangomm/CMakeLists.txt | 0
Tests/{GTK2Targets => FindGTK2}/pangomm/main.cpp | 0
.../pangoxft/CMakeLists.txt | 0
Tests/{GTK2Targets => FindGTK2}/pangoxft/main.c | 0
.../sigc++/CMakeLists.txt | 0
Tests/{GTK2Targets => FindGTK2}/sigc++/main.cpp | 0
Tests/GTK2Targets/gtk/CMakeLists.txt | 10 --
Tests/GTK2Targets/gtkmm/CMakeLists.txt | 10 --
51 files changed, 134 insertions(+), 124 deletions(-)
rename Tests/{GTK2Targets => FindGTK2}/CMakeLists.txt (55%)
rename Tests/{GTK2Targets => FindGTK2}/atk/CMakeLists.txt (100%)
rename Tests/{GTK2Targets => FindGTK2}/atk/main.c (100%)
rename Tests/{GTK2Targets => FindGTK2}/atkmm/CMakeLists.txt (100%)
rename Tests/{GTK2Targets => FindGTK2}/atkmm/main.cpp (100%)
rename Tests/{GTK2Targets => FindGTK2}/cairo/CMakeLists.txt (100%)
rename Tests/{GTK2Targets => FindGTK2}/cairo/main.c (100%)
rename Tests/{GTK2Targets => FindGTK2}/cairomm/CMakeLists.txt (100%)
rename Tests/{GTK2Targets => FindGTK2}/cairomm/main.cpp (100%)
rename Tests/{GTK2Targets => FindGTK2}/gdk/CMakeLists.txt (100%)
rename Tests/{GTK2Targets => FindGTK2}/gdk/main.c (100%)
rename Tests/{GTK2Targets => FindGTK2}/gdk_pixbuf/CMakeLists.txt (100%)
rename Tests/{GTK2Targets => FindGTK2}/gdk_pixbuf/main.c (100%)
rename Tests/{GTK2Targets => FindGTK2}/gdkmm/CMakeLists.txt (100%)
rename Tests/{GTK2Targets => FindGTK2}/gdkmm/main.cpp (100%)
rename Tests/{GTK2Targets => FindGTK2}/gio/CMakeLists.txt (100%)
rename Tests/{GTK2Targets => FindGTK2}/gio/main.c (100%)
rename Tests/{GTK2Targets => FindGTK2}/giomm/CMakeLists.txt (100%)
rename Tests/{GTK2Targets => FindGTK2}/giomm/main.cpp (100%)
rename Tests/{GTK2Targets => FindGTK2}/glib/CMakeLists.txt (100%)
rename Tests/{GTK2Targets => FindGTK2}/glib/main.c (100%)
rename Tests/{GTK2Targets => FindGTK2}/glibmm/CMakeLists.txt (100%)
rename Tests/{GTK2Targets => FindGTK2}/glibmm/main.cpp (100%)
rename Tests/{GTK2Targets => FindGTK2}/gmodule/CMakeLists.txt (100%)
rename Tests/{GTK2Targets => FindGTK2}/gmodule/main.c (100%)
rename Tests/{GTK2Targets => FindGTK2}/gobject/CMakeLists.txt (100%)
rename Tests/{GTK2Targets => FindGTK2}/gobject/main.c (100%)
rename Tests/{GTK2Targets => FindGTK2}/gthread/CMakeLists.txt (100%)
rename Tests/{GTK2Targets => FindGTK2}/gthread/main.c (100%)
create mode 100644 Tests/FindGTK2/gtk/CMakeLists.txt
rename Tests/{GTK2Targets => FindGTK2}/gtk/main.c (100%)
create mode 100644 Tests/FindGTK2/gtkmm/CMakeLists.txt
rename Tests/{GTK2Targets => FindGTK2}/gtkmm/helloworld.cpp (100%)
rename Tests/{GTK2Targets => FindGTK2}/gtkmm/helloworld.h (100%)
rename Tests/{GTK2Targets => FindGTK2}/gtkmm/main.cpp (100%)
rename Tests/{GTK2Targets => FindGTK2}/pango/CMakeLists.txt (100%)
rename Tests/{GTK2Targets => FindGTK2}/pango/main.c (100%)
rename Tests/{GTK2Targets => FindGTK2}/pangocairo/CMakeLists.txt (100%)
rename Tests/{GTK2Targets => FindGTK2}/pangocairo/main.c (100%)
rename Tests/{GTK2Targets => FindGTK2}/pangoft2/CMakeLists.txt (100%)
rename Tests/{GTK2Targets => FindGTK2}/pangoft2/main.c (100%)
rename Tests/{GTK2Targets => FindGTK2}/pangomm/CMakeLists.txt (100%)
rename Tests/{GTK2Targets => FindGTK2}/pangomm/main.cpp (100%)
rename Tests/{GTK2Targets => FindGTK2}/pangoxft/CMakeLists.txt (100%)
rename Tests/{GTK2Targets => FindGTK2}/pangoxft/main.c (100%)
rename Tests/{GTK2Targets => FindGTK2}/sigc++/CMakeLists.txt (100%)
rename Tests/{GTK2Targets => FindGTK2}/sigc++/main.cpp (100%)
delete mode 100644 Tests/GTK2Targets/gtk/CMakeLists.txt
delete mode 100644 Tests/GTK2Targets/gtkmm/CMakeLists.txt
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list