[Cmake-commits] CMake branch, next, updated. v3.6.1-1450-gf80a411
Brad King
brad.king at kitware.com
Thu Aug 25 11:27:31 EDT 2016
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 f80a4113e66cc5e83367af25c96faeaaa95d7a46 (commit)
via 20d7da5276704864569fb08259278a08c5f9e725 (commit)
via 4ef8a205edf66b652418aa5491436d26fd806175 (commit)
from d89838e180cf2d1f6aab2c403135d599c775e9af (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=f80a4113e66cc5e83367af25c96faeaaa95d7a46
commit f80a4113e66cc5e83367af25c96faeaaa95d7a46
Merge: d89838e 20d7da5
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu Aug 25 11:27:31 2016 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Aug 25 11:27:31 2016 -0400
Merge topic 'FindwxWidgets-library-path' into next
20d7da52 FindwxWidgets: Add VS-versioned library directory prefixes
4ef8a205 FindwxWidgets: Add version 3.1.0
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=20d7da5276704864569fb08259278a08c5f9e725
commit 20d7da5276704864569fb08259278a08c5f9e725
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Aug 24 23:09:26 2016 +0200
Commit: Brad King <brad.king at kitware.com>
CommitDate: Thu Aug 25 11:26:34 2016 -0400
FindwxWidgets: Add VS-versioned library directory prefixes
Add Visual Studio version number (supported: VS2008 to VS2015) to
WX_LIB_DIR_PREFIX (old: vc / vc_x64; new: vc120 / vc120_x64).
Patch-by: Hannes Grobler (Johnny_xy on gitlab.kitware.com)
diff --git a/Modules/FindwxWidgets.cmake b/Modules/FindwxWidgets.cmake
index 30b8e21..47a70f5 100644
--- a/Modules/FindwxWidgets.cmake
+++ b/Modules/FindwxWidgets.cmake
@@ -504,10 +504,22 @@ if(wxWidgets_FIND_STYLE STREQUAL "win32")
# settings.
if(MINGW)
set(WX_LIB_DIR_PREFIX gcc)
- elseif(CMAKE_CL_64)
- set(WX_LIB_DIR_PREFIX vc_x64)
- else()
+ elseif(MSVC)
set(WX_LIB_DIR_PREFIX vc)
+ if(MSVC14)
+ set(WX_LIB_DIR_PREFIX ${WX_LIB_DIR_PREFIX}140)
+ elseif(MSVC12)
+ set(WX_LIB_DIR_PREFIX ${WX_LIB_DIR_PREFIX}120)
+ elseif(MSVC11)
+ set(WX_LIB_DIR_PREFIX ${WX_LIB_DIR_PREFIX}110)
+ elseif(MSVC10)
+ set(WX_LIB_DIR_PREFIX ${WX_LIB_DIR_PREFIX}100)
+ elseif(MSVC90)
+ set(WX_LIB_DIR_PREFIX ${WX_LIB_DIR_PREFIX}90)
+ endif()
+ if(CMAKE_SIZEOF_VOID_P EQUAL 8)
+ set(WX_LIB_DIR_PREFIX ${WX_LIB_DIR_PREFIX}_x64)
+ endif()
endif()
if(BUILD_SHARED_LIBS)
find_path(wxWidgets_LIB_DIR
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4ef8a205edf66b652418aa5491436d26fd806175
commit 4ef8a205edf66b652418aa5491436d26fd806175
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Aug 24 23:09:26 2016 +0200
Commit: Brad King <brad.king at kitware.com>
CommitDate: Thu Aug 25 11:25:38 2016 -0400
FindwxWidgets: Add version 3.1.0
Patch-by: Hannes Grobler (Johnny_xy on gitlab.kitware.com)
diff --git a/Modules/FindwxWidgets.cmake b/Modules/FindwxWidgets.cmake
index 2974b9e..30b8e21 100644
--- a/Modules/FindwxWidgets.cmake
+++ b/Modules/FindwxWidgets.cmake
@@ -452,6 +452,7 @@ if(wxWidgets_FIND_STYLE STREQUAL "win32")
D:/
ENV ProgramFiles
PATH_SUFFIXES
+ wxWidgets-3.1.0
wxWidgets-3.0.2
wxWidgets-3.0.1
wxWidgets-3.0.0
-----------------------------------------------------------------------
Summary of changes:
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list