View Issue Details [ Jump to Notes ]

Project

Tags

No tags attached.

findgtk2-netbsd.patch [^] (532 bytes) 2011-11-28 17:42 [Show Content] [Hide Content]

diff --git a/Modules/FindGTK2.cmake b/Modules/FindGTK2.cmake
index a03c023..edb9161 100644
--- a/Modules/FindGTK2.cmake
+++ b/Modules/FindGTK2.cmake
@@ -197,6 +197,9 @@ function(_GTK2_FIND_INCLUDE_DIR _var _hdr)
             /sw/lib
             /opt/local/include
             /opt/local/lib
+            /usr/pkg/include
+            /usr/pkg/lib
+            /usr/pkg/include/glib
             $ENV{GTKMM_BASEPATH}/include
             $ENV{GTKMM_BASEPATH}/lib
             [HKEY_CURRENT_USER\\SOFTWARE\\gtkmm\\2.4;Path]/include

findgtk2-netbsd-2.patch [^] (502 bytes) 2012-10-02 15:52 [Show Content] [Hide Content]

diff --git a/Modules/FindGTK2.cmake b/Modules/FindGTK2.cmake
index a03c023..edb9161 100644
--- a/Modules/FindGTK2.cmake
+++ b/Modules/FindGTK2.cmake
@@ -197,6 +197,9 @@ function(_GTK2_FIND_INCLUDE_DIR _var _hdr)
             /sw/lib
             /opt/local/include
             /opt/local/lib
+            /usr/pkg/lib
+            /usr/pkg/include/glib
             $ENV{GTKMM_BASEPATH}/include
             $ENV{GTKMM_BASEPATH}/lib
             [HKEY_CURRENT_USER\\SOFTWARE\\gtkmm\\2.4;Path]/include

findgtk2-netbsd-3.patch [^] (493 bytes) 2012-10-02 18:49 [Show Content] [Hide Content]

diff --git a/Modules/FindGTK2.cmake b/Modules/FindGTK2.cmake
index 49af0f2..6838efd 100644
--- a/Modules/FindGTK2.cmake
+++ b/Modules/FindGTK2.cmake
@@ -192,6 +192,8 @@ function(_GTK2_FIND_INCLUDE_DIR _var _hdr)
             /usr/openwin
             /sw
             /opt/local
+            /usr/pkg/lib
+            /usr/pkg/include/glib
             ENV GTKMM_BASEPATH
             [HKEY_CURRENT_USER\\SOFTWARE\\gtkmm\\2.4;Path]
             [HKEY_LOCAL_MACHINE\\SOFTWARE\\gtkmm\\2.4;Path]

FindGTK2.cmake [^] (21,535 bytes) 2012-10-02 23:53

FindGTK2-2.cmake [^] (21,568 bytes) 2012-10-03 15:26

FindGTK2-3.cmake [^] (22,101 bytes) 2012-10-04 01:22

Relationships

Notes
(0031153) Guillaume Duhamel (reporter) 2012-10-02 15:53	Uploaded a new version of the patch as the first one added a useless path (/usr/pkg/include is already search by find_path as /usr/pkg is a system path and include a standard suffix)

(0031155) Guillaume Duhamel (reporter) 2012-10-02 18:49	Uploaded yet another version that applies on the current repository head.

(0031156) Philip Lowman (developer) 2012-10-02 23:52	Guillaume, thanks for the patch. There was a regression introduced recently in FindGTK2 (8/14/12) by someone trying to improve suffix searching in many CMake modules. This may explain the different changes you had to do -- sorry about that -- I wasn't aware of the regression until this evening. Please try the attached version and let me know if it works for you and/or if anything can be safely removed or needs to be added. For now I included the 2 lines listed in your latest patch.

(0031167) Guillaume Duhamel (reporter) 2012-10-03 15:26	I updated it a bit again as there was some paths not found: /usr/pkg/include/glib/glib-2.0/glib.h This one was previously found by: /usr/pkg/include/glib + ${_d}, but ${_d} is not in the suffixes anymore, so I added it back. /usr/pkg/lib/gtk-2.0/include /usr/pkg/lib/glib-2.0/include I modified /usr/pkg/lib to /usr/pkg as the "lib" part is now in the suffix. (ie: "lib/${_d}/include"). An alternative would be to keep /usr/pkg/lib in the paths and add "${_d}/include" in the suffixes.

(0031169) Philip Lowman (developer) 2012-10-04 01:18	Turns out I was mistaken and the approach that the person who regressed FindGTK2 was taking simply doesn't work at all (although I thought I had it working last night). The code was making an assumption that find_path() would search CMAKE_SYSTEM_PREFIXES and you could tack on "lib" and "include" but it turns out this isn't the case (find_path only searches <prefix>/include for each entry in CMAKE_SYSTEM_PREFIXES. Anyways, I've basically reverted that work and applied your initial patch along with another fix for Debian. I've merged the latest version (attached) to next. Really sorry for all the back and forth on this one.

(0032477) Robert Maynard (manager) 2013-03-04 08:38	Closing resolved issues that have not been updated in more than 4 months.

Issue History
Date Modified	Username	Field	Change
2011-11-28 17:42	Guillaume Duhamel	New Issue
2011-11-28 17:42	Guillaume Duhamel	File Added: findgtk2-netbsd.patch
2011-11-29 08:26	Brad King	Assigned To	=> Philip Lowman
2011-11-29 08:26	Brad King	Status	new => assigned
2012-10-02 15:52	Guillaume Duhamel	File Added: findgtk2-netbsd-2.patch
2012-10-02 15:53	Guillaume Duhamel	Note Added: 0031153
2012-10-02 18:49	Guillaume Duhamel	File Added: findgtk2-netbsd-3.patch
2012-10-02 18:49	Guillaume Duhamel	Note Added: 0031155
2012-10-02 23:52	Philip Lowman	Note Added: 0031156
2012-10-02 23:52	Philip Lowman	Target Version	=> CMake 2.8.10
2012-10-02 23:53	Philip Lowman	File Added: FindGTK2.cmake
2012-10-03 15:26	Guillaume Duhamel	File Added: FindGTK2-2.cmake
2012-10-03 15:26	Guillaume Duhamel	Note Added: 0031167
2012-10-04 01:18	Philip Lowman	Note Added: 0031169
2012-10-04 01:22	Philip Lowman	File Added: FindGTK2-3.cmake
2012-10-18 15:59	Philip Lowman	Status	assigned => resolved
2012-10-18 15:59	Philip Lowman	Fixed in Version	=> CMake 2.8.10
2012-10-18 15:59	Philip Lowman	Resolution	open => fixed
2013-03-04 08:38	Robert Maynard	Note Added: 0032477
2013-03-04 08:38	Robert Maynard	Status	resolved => closed