View Issue Details [ Jump to Notes ]

Project

Tags

No tags attached.

cmake-wxWidgets.patch [^] (628 bytes) 2015-04-29 12:11 [Show Content] [Hide Content]

diff --git a/Modules/FindwxWidgets.cmake b/Modules/FindwxWidgets.cmake
index dec0ddf..89715ec 100644
--- a/Modules/FindwxWidgets.cmake
+++ b/Modules/FindwxWidgets.cmake
@@ -740,7 +740,7 @@ else()
     # UNIX: Start actual work.
     #-----------------------------------------------------------------
     # Support cross-compiling, only search in the target platform.
-    find_program(wxWidgets_CONFIG_EXECUTABLE wx-config
+    find_program(wxWidgets_CONFIG_EXECUTABLE NAMES wx-config-3.0 wx-config
       DOC "Location of wxWidgets library configuration provider binary (wx-config)."
       ONLY_CMAKE_FIND_ROOT_PATH
       )

Relationships

Notes
(0038639) Brad King (manager) 2015-04-29 12:52	Thanks. I applied it with the order switched: FindwxWidgets: Search for wx-config-3.0 in addition to wx-config http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1b04561e [^] We need to search for the unversioned executable name first in case the user has one earlier in their PATH.

(0038640) Orion Poplawski (reporter) 2015-04-29 12:58	Hmm, I guess I was assuming the case in Fedora where both wxGTK-devel and wxGTK3-devel where installed, and we would want to prefer wxGTK3. But at least for most rpm builds probably only one will be installed.

(0038641) Brad King (manager) 2015-04-29 13:04	Re 0015540:0038640: If you want to force a specific version when packaging then add -DwxWidgets_CONFIG_EXECUTABLE=/usr/bin/wx-config-3.0 on the command line of the dependent project's build script.

(0039795) Robert Maynard (manager) 2015-11-02 09:13	Closing resolved issues that have not been updated in more than 4 months.

Issue History
Date Modified	Username	Field	Change
2015-04-29 12:11	Orion Poplawski	New Issue
2015-04-29 12:11	Orion Poplawski	File Added: cmake-wxWidgets.patch
2015-04-29 12:52	Brad King	Note Added: 0038639
2015-04-29 12:52	Brad King	Assigned To	=> Brad King
2015-04-29 12:52	Brad King	Status	new => resolved
2015-04-29 12:52	Brad King	Resolution	open => fixed
2015-04-29 12:52	Brad King	Fixed in Version	=> CMake 3.3
2015-04-29 12:52	Brad King	Target Version	=> CMake 3.3
2015-04-29 12:58	Orion Poplawski	Note Added: 0038640
2015-04-29 13:04	Brad King	Note Added: 0038641
2015-11-02 09:13	Robert Maynard	Note Added: 0039795
2015-11-02 09:13	Robert Maynard	Status	resolved => closed