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 6b400f503118e894685bb88f7b18ade37bca5dfe (commit)
via 52e8fa2312c73338c7fac38e7c2b30f136f4d247 (commit)
from a9540002c5101e533e1896a4150462f20ceac68f (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6b400f503118e894685bb88f7b18ade37bca5dfe
commit 6b400f503118e894685bb88f7b18ade37bca5dfe
Merge: a954000 52e8fa2
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Mon Oct 17 11:07:48 2016 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Mon Oct 17 11:07:48 2016 -0400
Merge topic 'FindwxWidgets-unversioned-library-path' into next
52e8fa23 FindwxWidgets: Fix finding unversioned VS-built directory prefixes
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=52e8fa2312c73338c7fac38e7c2b30f136f4d247
commit 52e8fa2312c73338c7fac38e7c2b30f136f4d247
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Mon Oct 17 10:39:36 2016 -0400
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Mon Oct 17 11:06:00 2016 -0400
FindwxWidgets: Fix finding unversioned VS-built directory prefixes
The change in commit v3.7.0-rc1~217^2 (FindwxWidgets: Add VS-versioned
library directory prefixes, 2016-08-24) works only for official
wxWidgets builds that add the VS-versioned directory prefixes. Local
wxWidgets builds still have an unversioned prefix. Search them.
Closes: #16366
diff --git a/Modules/FindwxWidgets.cmake b/Modules/FindwxWidgets.cmake
index eee47db..77091f4 100644
--- a/Modules/FindwxWidgets.cmake
+++ b/Modules/FindwxWidgets.cmake
@@ -491,23 +491,26 @@ if(wxWidgets_FIND_STYLE STREQUAL "win32")
# Select one default tree inside the already determined wx tree.
# Prefer static/shared order usually consistent with build
# settings.
+ set(_WX_TOOL "")
+ set(_WX_TOOLVER "")
+ set(_WX_ARCH "")
if(MINGW)
- set(WX_LIB_DIR_PREFIX gcc)
+ set(_WX_TOOL gcc)
elseif(MSVC)
- set(WX_LIB_DIR_PREFIX vc)
+ set(_WX_TOOL vc)
if(MSVC14)
- set(WX_LIB_DIR_PREFIX ${WX_LIB_DIR_PREFIX}140)
+ set(_WX_TOOLVER 140)
elseif(MSVC12)
- set(WX_LIB_DIR_PREFIX ${WX_LIB_DIR_PREFIX}120)
+ set(_WX_TOOLVER 120)
elseif(MSVC11)
- set(WX_LIB_DIR_PREFIX ${WX_LIB_DIR_PREFIX}110)
+ set(_WX_TOOLVER 110)
elseif(MSVC10)
- set(WX_LIB_DIR_PREFIX ${WX_LIB_DIR_PREFIX}100)
+ set(_WX_TOOLVER 100)
elseif(MSVC90)
- set(WX_LIB_DIR_PREFIX ${WX_LIB_DIR_PREFIX}90)
+ set(_WX_TOOLVER 90)
endif()
if(CMAKE_SIZEOF_VOID_P EQUAL 8)
- set(WX_LIB_DIR_PREFIX ${WX_LIB_DIR_PREFIX}_x64)
+ set(_WX_ARCH _x64)
endif()
endif()
if(BUILD_SHARED_LIBS)
@@ -522,8 +525,10 @@ if(wxWidgets_FIND_STYLE STREQUAL "win32")
mswunivu/wx/setup.h
mswunivud/wx/setup.h
PATHS
- ${WX_ROOT_DIR}/lib/${WX_LIB_DIR_PREFIX}_dll # prefer shared
- ${WX_ROOT_DIR}/lib/${WX_LIB_DIR_PREFIX}_lib
+ ${WX_ROOT_DIR}/lib/${_WX_TOOL}${_WX_TOOLVER}${_WX_ARCH}_dll # prefer
shared
+ ${WX_ROOT_DIR}/lib/${_WX_TOOL}${_WX_ARCH}_dll # prefer
shared
+ ${WX_ROOT_DIR}/lib/${_WX_TOOL}${_WX_TOOLVER}${_WX_ARCH}_lib
+ ${WX_ROOT_DIR}/lib/${_WX_TOOL}${_WX_ARCH}_lib
DOC "Path to wxWidgets libraries"
NO_DEFAULT_PATH
)
@@ -539,12 +544,17 @@ if(wxWidgets_FIND_STYLE STREQUAL "win32")
mswunivu/wx/setup.h
mswunivud/wx/setup.h
PATHS
- ${WX_ROOT_DIR}/lib/${WX_LIB_DIR_PREFIX}_lib # prefer static
- ${WX_ROOT_DIR}/lib/${WX_LIB_DIR_PREFIX}_dll
+ ${WX_ROOT_DIR}/lib/${_WX_TOOL}${_WX_TOOLVER}${_WX_ARCH}_lib # prefer
static
+ ${WX_ROOT_DIR}/lib/${_WX_TOOL}${_WX_ARCH}_lib # prefer
static
+ ${WX_ROOT_DIR}/lib/${_WX_TOOL}${_WX_TOOLVER}${_WX_ARCH}_dll
+ ${WX_ROOT_DIR}/lib/${_WX_TOOL}${_WX_ARCH}_dll
DOC "Path to wxWidgets libraries"
NO_DEFAULT_PATH
)
endif()
+ unset(_WX_TOOL)
+ unset(_WX_TOOLVER)
+ unset(_WX_ARCH)
# If wxWidgets_LIB_DIR changed, clear all libraries.
if(NOT WX_LIB_DIR STREQUAL wxWidgets_LIB_DIR)
-----------------------------------------------------------------------
Summary of changes:
Modules/FindwxWidgets.cmake | 34 ++++++++++++++++++++++------------
1 file changed, 22 insertions(+), 12 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
