[Cmake-commits] CMake branch, master, updated. v2.8.12.1-763-gac2acd2
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, master has been updated via ac2acd22dd98172af52034e59db9d1652033dd37 (commit) from 9e952fbf18bddec90b874d7b0139a6ca3b78f0c9 (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=ac2acd22dd98172af52034e59db9d1652033dd37 commit ac2acd22dd98172af52034e59db9d1652033dd37 Author: Kitware Robot AuthorDate: Mon Nov 25 00:01:06 2013 -0500 Commit: Kitware Robot CommitDate: Mon Nov 25 00:01:06 2013 -0500 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index 979881d..ea5c9be 100644 --- a/Source/CMakeVersion.cmake +++ b/Source/CMakeVersion.cmake @@ -2,5 +2,5 @@ set(CMake_VERSION_MAJOR 2) set(CMake_VERSION_MINOR 8) set(CMake_VERSION_PATCH 12) -set(CMake_VERSION_TWEAK 20131124) +set(CMake_VERSION_TWEAK 20131125) #set(CMake_VERSION_RC 1) --- Summary of changes: Source/CMakeVersion.cmake |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v2.8.12.1-5726-g3b30ff6
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 3b30ff6cb8e465e3152e17da655e74b8ac331a12 (commit)
via c8ac63c6d16505736deb110622cfb6f959bc8427 (commit)
via 17661853a25a4454403f6b97d0d3a04a7236228a (commit)
via 47573856af5eebf91e926274cc147c650669f198 (commit)
from 0030edf995e110b391f5e1d55177ac91ad9ee4bb (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=3b30ff6cb8e465e3152e17da655e74b8ac331a12
commit 3b30ff6cb8e465e3152e17da655e74b8ac331a12
Merge: 0030edf c8ac63c
Author: Alexander Neundorf
AuthorDate: Sun Nov 24 17:46:04 2013 -0500
Commit: CMake Topic Stage
CommitDate: Sun Nov 24 17:46:04 2013 -0500
Merge topic 'KateProjectGenerator2' into next
c8ac63c kate: add some documentation
1766185 kate generator: insert build targets
4757385 kate: add project generator for the Kate project plugin
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c8ac63c6d16505736deb110622cfb6f959bc8427
commit c8ac63c6d16505736deb110622cfb6f959bc8427
Author: Alex Neundorf
AuthorDate: Sat Nov 16 16:13:13 2013 +0100
Commit: Alex Neundorf
CommitDate: Sun Nov 24 22:57:04 2013 +0100
kate: add some documentation
Alex
diff --git a/Help/generator/Kate - MinGW Makefiles.rst b/Help/generator/Kate -
MinGW Makefiles.rst
new file mode 100644
index 000..ffdab59
--- /dev/null
+++ b/Help/generator/Kate - MinGW Makefiles.rst
@@ -0,0 +1,12 @@
+Kate - Unix Makefiles
+---
+
+Generates Kate project files.
+
+A project file for Kate will be created in the top directory in the top level
+build directory.
+To use it in kate, the Project plugin must be enabled.
+The project file is loaded in kate simply by opening the
+ProjectName.kateproject file in the editor.
+If the kate Build-plugin is enabled, all targets generated by CMake are
+available for building.
diff --git a/Help/generator/Kate - NMake Makefiles.rst b/Help/generator/Kate -
NMake Makefiles.rst
new file mode 100644
index 000..ffdab59
--- /dev/null
+++ b/Help/generator/Kate - NMake Makefiles.rst
@@ -0,0 +1,12 @@
+Kate - Unix Makefiles
+---
+
+Generates Kate project files.
+
+A project file for Kate will be created in the top directory in the top level
+build directory.
+To use it in kate, the Project plugin must be enabled.
+The project file is loaded in kate simply by opening the
+ProjectName.kateproject file in the editor.
+If the kate Build-plugin is enabled, all targets generated by CMake are
+available for building.
diff --git a/Help/generator/Kate - Ninja.rst b/Help/generator/Kate - Ninja.rst
new file mode 100644
index 000..ffdab59
--- /dev/null
+++ b/Help/generator/Kate - Ninja.rst
@@ -0,0 +1,12 @@
+Kate - Unix Makefiles
+---
+
+Generates Kate project files.
+
+A project file for Kate will be created in the top directory in the top level
+build directory.
+To use it in kate, the Project plugin must be enabled.
+The project file is loaded in kate simply by opening the
+ProjectName.kateproject file in the editor.
+If the kate Build-plugin is enabled, all targets generated by CMake are
+available for building.
diff --git a/Help/generator/Kate - Unix Makefiles.rst b/Help/generator/Kate -
Unix Makefiles.rst
new file mode 100644
index 000..ffdab59
--- /dev/null
+++ b/Help/generator/Kate - Unix Makefiles.rst
@@ -0,0 +1,12 @@
+Kate - Unix Makefiles
+---
+
+Generates Kate project files.
+
+A project file for Kate will be created in the top directory in the top level
+build directory.
+To use it in kate, the Project plugin must be enabled.
+The project file is loaded in kate simply by opening the
+ProjectName.kateproject file in the editor.
+If the kate Build-plugin is enabled, all targets generated by CMake are
+available for building.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=17661853a25a4454403f6b97d0d3a04a7236228a
commit 17661853a25a4454403f6b97d0d3a04a7236228a
Author: Alex Neundorf
AuthorDate: Mon May 20 17:28:00 2013 +0200
Commit: Alex Neundorf
CommitDate: Sun Nov 24 22:57:04 2013 +0100
kate generator: insert build targets
This can be used by the build plugin in kate.
Code is quite similar to the one for Eclipse.
Alex
diff --git a/Source/cmExtraKateGenerator.cxx b/Source/cmExtraKateGenerator.cxx
index de3da15..f020ddb 100644
--- a/Source/cmExtraKateGenerator.cxx
+++ b/Source/cmExtraKateGenerator.cxx
@@ -74,18 +74,146 @@ void cmExtraKateGenerator::CreateKateProjectFile(const
cmMakefile* mf) const
"{\n"
"\t\"name\": \
[Cmake-commits] CMake branch, next, updated. v2.8.12.1-5722-g0030edf
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 0030edf995e110b391f5e1d55177ac91ad9ee4bb (commit) via 1dc52211b995a779f5e48340511459e91ed622e6 (commit) from 893210b2e567ecfa66e7d311c123e4bd1047efd9 (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=0030edf995e110b391f5e1d55177ac91ad9ee4bb commit 0030edf995e110b391f5e1d55177ac91ad9ee4bb Merge: 893210b 1dc5221 Author: Stephen Kelly AuthorDate: Sun Nov 24 17:32:39 2013 -0500 Commit: CMake Topic Stage CommitDate: Sun Nov 24 17:32:39 2013 -0500 Merge topic 'INTERFACE_AUTOUIC_OPTIONS' into next 1dc5221 Add missing const. http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1dc52211b995a779f5e48340511459e91ed622e6 commit 1dc52211b995a779f5e48340511459e91ed622e6 Author: Stephen Kelly AuthorDate: Sun Nov 24 23:32:12 2013 +0100 Commit: Stephen Kelly CommitDate: Sun Nov 24 23:32:12 2013 +0100 Add missing const. diff --git a/Tests/QtAutoUicInterface/mywidget.h b/Tests/QtAutoUicInterface/mywidget.h index 800c30a..c96fb98 100644 --- a/Tests/QtAutoUicInterface/mywidget.h +++ b/Tests/QtAutoUicInterface/mywidget.h @@ -18,7 +18,7 @@ public: explicit MyWidget(QWidget *parent = 0); private: - std::auto_ptr ui; + const std::auto_ptr ui; }; #endif --- Summary of changes: Tests/QtAutoUicInterface/mywidget.h |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v2.8.12.1-5720-g893210b
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 893210b2e567ecfa66e7d311c123e4bd1047efd9 (commit)
via 0e88d54bd16a04cf972a93639150223c0c2a878c (commit)
via dd732da34baafb09a97446ddeead28b5c3f001c9 (commit)
via ea44cd8ed6b18bce7aa6194d22a1597b22bfae77 (commit)
from 65ca1fb21260ba4a440b69376245a4a2b74e21f0 (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=893210b2e567ecfa66e7d311c123e4bd1047efd9
commit 893210b2e567ecfa66e7d311c123e4bd1047efd9
Merge: 65ca1fb 0e88d54
Author: Stephen Kelly
AuthorDate: Sun Nov 24 17:03:11 2013 -0500
Commit: CMake Topic Stage
CommitDate: Sun Nov 24 17:03:11 2013 -0500
Merge topic 'INTERFACE_AUTOUIC_OPTIONS' into next
0e88d54 Try to make the uic command line appear in the dashboard output.
dd732da Use auto_ptr instead of QScopedPointer.
ea44cd8 Add error output messages.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0e88d54bd16a04cf972a93639150223c0c2a878c
commit 0e88d54bd16a04cf972a93639150223c0c2a878c
Author: Stephen Kelly
AuthorDate: Sun Nov 24 23:02:33 2013 +0100
Commit: Stephen Kelly
CommitDate: Sun Nov 24 23:02:33 2013 +0100
Try to make the uic command line appear in the dashboard output.
diff --git a/Tests/QtAutoUicInterface/CMakeLists.txt
b/Tests/QtAutoUicInterface/CMakeLists.txt
index efee77e..555f016 100644
--- a/Tests/QtAutoUicInterface/CMakeLists.txt
+++ b/Tests/QtAutoUicInterface/CMakeLists.txt
@@ -27,6 +27,8 @@ set(CMAKE_AUTOUIC ON)
# BEGIN Upstream
+set(CMAKE_VERBOSE_MAKEFILE ON)
+
add_library(KI18n klocalizedstring.cpp)
target_link_libraries(KI18n ${QT_CORE_TARGET})
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=dd732da34baafb09a97446ddeead28b5c3f001c9
commit dd732da34baafb09a97446ddeead28b5c3f001c9
Author: Stephen Kelly
AuthorDate: Sun Nov 24 22:59:50 2013 +0100
Commit: Stephen Kelly
CommitDate: Sun Nov 24 22:59:50 2013 +0100
Use auto_ptr instead of QScopedPointer.
Not all Qt installations on the dashboard have QScopedPointer.
diff --git a/Tests/QtAutoUicInterface/libwidget.h
b/Tests/QtAutoUicInterface/libwidget.h
index 0b1de10..8b592ec 100644
--- a/Tests/QtAutoUicInterface/libwidget.h
+++ b/Tests/QtAutoUicInterface/libwidget.h
@@ -3,6 +3,7 @@
#define LIBWIDGET_H
#include
+#include
#if QT_VERSION < QT_VERSION_CHECK(5, 3, 0)
#include
@@ -17,7 +18,7 @@ public:
explicit LibWidget(QWidget *parent = 0);
private:
- QScopedPointer ui;
+ const std::auto_ptr ui;
};
#endif
diff --git a/Tests/QtAutoUicInterface/mywidget.h
b/Tests/QtAutoUicInterface/mywidget.h
index c066318..800c30a 100644
--- a/Tests/QtAutoUicInterface/mywidget.h
+++ b/Tests/QtAutoUicInterface/mywidget.h
@@ -3,6 +3,7 @@
#define MYWIDGET_H
#include
+#include
#if QT_VERSION < QT_VERSION_CHECK(5, 3, 0)
#include
@@ -17,7 +18,7 @@ public:
explicit MyWidget(QWidget *parent = 0);
private:
- QScopedPointer ui;
+ std::auto_ptr ui;
};
#endif
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ea44cd8ed6b18bce7aa6194d22a1597b22bfae77
commit ea44cd8ed6b18bce7aa6194d22a1597b22bfae77
Author: Stephen Kelly
AuthorDate: Sun Nov 24 22:59:37 2013 +0100
Commit: Stephen Kelly
CommitDate: Sun Nov 24 22:59:37 2013 +0100
Add error output messages.
diff --git a/Tests/QtAutoUicInterface/main.cpp
b/Tests/QtAutoUicInterface/main.cpp
index bf11f90..42d5958 100644
--- a/Tests/QtAutoUicInterface/main.cpp
+++ b/Tests/QtAutoUicInterface/main.cpp
@@ -9,6 +9,7 @@ int main(int argc, char **argv)
f.open(UI_LIBWIDGET_H);
if (!f.is_open())
{
+std::cout << "Could not open \"" UI_LIBWIDGET_H "\"." << std::endl;
return -1;
}
@@ -41,6 +42,7 @@ int main(int argc, char **argv)
f.open(UI_MYWIDGET_H);
if (!f.is_open())
{
+std::cout << "Could not open \"" UI_MYWIDGET_H "\"." << std::endl;
return -1;
}
---
Summary of changes:
Tests/QtAutoUicInterface/CMakeLists.txt |2 ++
Tests/QtAutoUicInterface/libwidget.h|3 ++-
Tests/QtAutoUicInterface/main.cpp |2 ++
Tests/QtAutoUicInterface/mywidget.h |3 ++-
4 files changed, 8 insertions(+), 2 deletions(-)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v2.8.12.1-5716-g65ca1fb
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 65ca1fb21260ba4a440b69376245a4a2b74e21f0 (commit)
via 8f8785fc5c422be4ab626ac0bc522ba5c0322e2c (commit)
from 9d646670c3d93366360e42d19d724a65f949f7b0 (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=65ca1fb21260ba4a440b69376245a4a2b74e21f0
commit 65ca1fb21260ba4a440b69376245a4a2b74e21f0
Merge: 9d64667 8f8785f
Author: Julien Schueller
AuthorDate: Sun Nov 24 15:16:12 2013 -0500
Commit: CMake Topic Stage
CommitDate: Sun Nov 24 15:16:12 2013 -0500
Merge topic 'UseSWIG-fix13772' into next
8f8785f Fixed .i relative source file location, fixes #0013772 (#0013173,
#0014459)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8f8785fc5c422be4ab626ac0bc522ba5c0322e2c
commit 8f8785fc5c422be4ab626ac0bc522ba5c0322e2c
Author: Julien Schueller
AuthorDate: Sat Nov 23 12:51:44 2013 +0100
Commit: Julien Schueller
CommitDate: Sat Nov 23 12:51:44 2013 +0100
Fixed .i relative source file location, fixes #0013772 (#0013173, #0014459)
diff --git a/Modules/UseSWIG.cmake b/Modules/UseSWIG.cmake
index 00f3e21..4329053 100644
--- a/Modules/UseSWIG.cmake
+++ b/Modules/UseSWIG.cmake
@@ -94,7 +94,6 @@ endmacro()
#
macro(SWIG_ADD_SOURCE_TO_MODULE name outfiles infile)
set(swig_full_infile ${infile})
- get_filename_component(swig_source_file_path "${infile}" PATH)
get_filename_component(swig_source_file_name_we "${infile}" NAME_WE)
get_source_file_property(swig_source_file_generated ${infile} GENERATED)
get_source_file_property(swig_source_file_cplusplus ${infile} CPLUSPLUS)
@@ -102,35 +101,8 @@ macro(SWIG_ADD_SOURCE_TO_MODULE name outfiles infile)
if("${swig_source_file_flags}" STREQUAL "NOTFOUND")
set(swig_source_file_flags "")
endif()
- set(swig_source_file_fullname "${infile}")
- if(${swig_source_file_path} MATCHES "^${CMAKE_CURRENT_SOURCE_DIR}")
-string(REGEX REPLACE
- "^${CMAKE_CURRENT_SOURCE_DIR}" ""
- swig_source_file_relative_path
- "${swig_source_file_path}")
- else()
-if(${swig_source_file_path} MATCHES "^${CMAKE_CURRENT_BINARY_DIR}")
- string(REGEX REPLACE
-"^${CMAKE_CURRENT_BINARY_DIR}" ""
-swig_source_file_relative_path
-"${swig_source_file_path}")
- set(swig_source_file_generated 1)
-else()
- set(swig_source_file_relative_path "${swig_source_file_path}")
- if(swig_source_file_generated)
-set(swig_source_file_fullname "${CMAKE_CURRENT_BINARY_DIR}/${infile}")
- else()
-set(swig_source_file_fullname "${CMAKE_CURRENT_SOURCE_DIR}/${infile}")
- endif()
-endif()
- endif()
+ get_filename_component(swig_source_file_fullname "${infile}" ABSOLUTE)
- set(swig_generated_file_fullname
-"${CMAKE_CURRENT_BINARY_DIR}")
- if(swig_source_file_relative_path)
-set(swig_generated_file_fullname
- "${swig_generated_file_fullname}/${swig_source_file_relative_path}")
- endif()
# If CMAKE_SWIG_OUTDIR was specified then pass it to -outdir
if(CMAKE_SWIG_OUTDIR)
set(swig_outdir ${CMAKE_SWIG_OUTDIR})
@@ -142,7 +114,7 @@ macro(SWIG_ADD_SOURCE_TO_MODULE name outfiles infile)
"${swig_outdir}"
"${infile}")
set(swig_generated_file_fullname
-"${swig_generated_file_fullname}/${swig_source_file_name_we}")
+"${swig_outdir}/${swig_source_file_name_we}")
# add the language into the name of the file (i.e. TCL_wrap)
# this allows for the same .i file to be wrapped into different languages
set(swig_generated_file_fullname
---
Summary of changes:
Modules/UseSWIG.cmake | 32 ++--
1 files changed, 2 insertions(+), 30 deletions(-)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v2.8.12.1-5714-g9d64667
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 9d646670c3d93366360e42d19d724a65f949f7b0 (commit)
via b1d007ce7c9aecac83fe59859c1aba4d6b82ae25 (commit)
from 2710aae7522473b21180799f2de310b0575abc3e (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=9d646670c3d93366360e42d19d724a65f949f7b0
commit 9d646670c3d93366360e42d19d724a65f949f7b0
Merge: 2710aae b1d007c
Author: Julien Schueller
AuthorDate: Sun Nov 24 15:15:54 2013 -0500
Commit: CMake Topic Stage
CommitDate: Sun Nov 24 15:15:54 2013 -0500
Merge topic 'UseSWIG-fix13814' into next
b1d007c Handle a dll name different than module name.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b1d007ce7c9aecac83fe59859c1aba4d6b82ae25
commit b1d007ce7c9aecac83fe59859c1aba4d6b82ae25
Author: Julien Schueller
AuthorDate: Sun Nov 24 17:54:59 2013 +0100
Commit: Julien Schueller
CommitDate: Sun Nov 24 17:54:59 2013 +0100
Handle a dll name different than module name.
diff --git a/Modules/UseSWIG.cmake b/Modules/UseSWIG.cmake
index 00f3e21..f957399 100644
--- a/Modules/UseSWIG.cmake
+++ b/Modules/UseSWIG.cmake
@@ -68,6 +68,10 @@ macro(SWIG_MODULE_INITIALIZE name language)
set(SWIG_MODULE_${name}_REAL_NAME "_${name}")
elseif("${SWIG_MODULE_${name}_LANGUAGE}" STREQUAL "PERL")
set(SWIG_MODULE_${name}_EXTRA_FLAGS "-shadow")
+ elseif("${SWIG_MODULE_${name}_LANGUAGE}" STREQUAL "CSHARP")
+# This makes sure that the name used in the generated DllImport
+# matches the library name created by CMake
+set(SWIG_MODULE_${name}_EXTRA_FLAGS "-dllimport;${name}")
endif()
endmacro()
---
Summary of changes:
Modules/UseSWIG.cmake |4
1 files changed, 4 insertions(+), 0 deletions(-)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v2.8.12.1-5712-g2710aae
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 2710aae7522473b21180799f2de310b0575abc3e (commit)
via 0e9bf6a257d2a2026bcd1d8f52f5a3d42ff9fabd (commit)
via 9e952fbf18bddec90b874d7b0139a6ca3b78f0c9 (commit)
from 75f4a82144cf3643e887ade282da2d12f108f9a9 (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=2710aae7522473b21180799f2de310b0575abc3e
commit 2710aae7522473b21180799f2de310b0575abc3e
Merge: 75f4a82 0e9bf6a
Author: Daniele E. Domenichelli
AuthorDate: Sun Nov 24 08:59:30 2013 -0500
Commit: CMake Topic Stage
CommitDate: Sun Nov 24 08:59:30 2013 -0500
Merge topic 'FindGTK2-quartz-backend' into next
0e9bf6a FindGTK2: Add support for Quartz backend on MAC
9e952fb CMake Nightly Date Stamp
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0e9bf6a257d2a2026bcd1d8f52f5a3d42ff9fabd
commit 0e9bf6a257d2a2026bcd1d8f52f5a3d42ff9fabd
Author: Daniele E. Domenichelli
AuthorDate: Sun Nov 24 14:52:39 2013 +0100
Commit: Daniele E. Domenichelli
CommitDate: Sun Nov 24 14:53:47 2013 +0100
FindGTK2: Add support for Quartz backend on MAC
Fix issue #14593
diff --git a/Modules/FindGTK2.cmake b/Modules/FindGTK2.cmake
index 25c482e..bc66337 100644
--- a/Modules/FindGTK2.cmake
+++ b/Modules/FindGTK2.cmake
@@ -689,7 +689,12 @@ foreach(_GTK2_component ${GTK2_FIND_COMPONENTS})
_GTK2_FIND_INCLUDE_DIR(GDK gdk/gdk.h)
_GTK2_FIND_INCLUDE_DIR(GDKCONFIG gdkconfig.h)
if(UNIX)
-_GTK2_FIND_LIBRARY(GDK gdk-x11 false true)
+if(APPLE)
+_GTK2_FIND_LIBRARY(GDK gdk-quartz false true)
+endif()
+if(NOT GTK2_GDK_FOUND)
+_GTK2_FIND_LIBRARY(GDK gdk-x11 false true)
+endif()
else()
_GTK2_FIND_LIBRARY(GDK gdk-win32 false true)
endif()
@@ -698,7 +703,12 @@ foreach(_GTK2_component ${GTK2_FIND_COMPONENTS})
_GTK2_FIND_INCLUDE_DIR(GTK gtk/gtk.h)
if(UNIX)
-_GTK2_FIND_LIBRARY(GTK gtk-x11 false true)
+if(APPLE)
+_GTK2_FIND_LIBRARY(GTK gtk-quartz false true)
+endif()
+if(NOT GTK2_GTK_FOUND)
+_GTK2_FIND_LIBRARY(GTK gtk-x11 false true)
+endif()
else()
_GTK2_FIND_LIBRARY(GTK gtk-win32 false true)
endif()
---
Summary of changes:
Modules/FindGTK2.cmake| 14 --
Source/CMakeVersion.cmake |2 +-
2 files changed, 13 insertions(+), 3 deletions(-)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
