kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'FindwxWidgets-versioned-executable' into release

This commit is contained in:
Brad King 2015-06-08 09:19:39 -04:00
parent a97b910655 2c96974315
commit a20ca0c603
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Modules/FindwxWidgets.cmake
View File

@ -740,7 +740,8 @@ else()
# UNIX: Start actual work. # UNIX: Start actual work.
#----------------------------------------------------------------- #-----------------------------------------------------------------
# Support cross-compiling, only search in the target platform. # Support cross-compiling, only search in the target platform.
find_program(wxWidgets_CONFIG_EXECUTABLE wx-config wx-config-3.0 find_program(wxWidgets_CONFIG_EXECUTABLE
NAMES wx-config wx-config-3.0 wx-config-2.9 wx-config-2.8
DOC "Location of wxWidgets library configuration provider binary (wx-config)." DOC "Location of wxWidgets library configuration provider binary (wx-config)."
ONLY_CMAKE_FIND_ROOT_PATH ONLY_CMAKE_FIND_ROOT_PATH
) )