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 6c803a5e62cb16cafc16088abce7e29e1a36449f (commit) via 15aacb684a4416dc287cb165394b1115e9c4c4cc (commit) via 8122fbd0f57f546d46c5a9659fb12f1740042966 (commit) via 6089fde554aedb4888c7114fa433d14375b8a213 (commit) from 86c7715ae169ac35e8d846a4ff23baf6d82d7bcc (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 ----------------------------------------------------------------- http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6c803a5e62cb16cafc16088abce7e29e1a36449f commit 6c803a5e62cb16cafc16088abce7e29e1a36449f Merge: 86c7715 15aacb6 Author: Brad King <brad.k...@kitware.com> AuthorDate: Wed Sep 9 10:20:53 2015 -0400 Commit: CMake Topic Stage <kwro...@kitware.com> CommitDate: Wed Sep 9 10:20:53 2015 -0400 Merge topic 'FindwxWidgets-updates' into next 15aacb68 FindwxWidgets: Add wxWidgets webview component 8122fbd0 FindwxWidgets: Expect wxWidgets 3.1 6089fde5 FindwxWidgets: allow specifying required version http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=15aacb684a4416dc287cb165394b1115e9c4c4cc commit 15aacb684a4416dc287cb165394b1115e9c4c4cc Author: Simon Richter <simon.rich...@hogyros.de> AuthorDate: Sun Sep 6 18:35:38 2015 +0200 Commit: Brad King <brad.k...@kitware.com> CommitDate: Wed Sep 9 10:20:23 2015 -0400 FindwxWidgets: Add wxWidgets webview component diff --git a/Modules/FindwxWidgets.cmake b/Modules/FindwxWidgets.cmake index 52aafd7..54a74f6 100644 --- a/Modules/FindwxWidgets.cmake +++ b/Modules/FindwxWidgets.cmake @@ -390,7 +390,7 @@ if(wxWidgets_FIND_STYLE STREQUAL "win32") # Clear wxWidgets multilib libraries. foreach(LIB core adv aui html media xrc dbgrid gl qa richtext - stc ribbon propgrid) + webview stc ribbon propgrid) WX_CLEAR_LIB(WX_${LIB}${_DBG}) endforeach() endmacro() http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8122fbd0f57f546d46c5a9659fb12f1740042966 commit 8122fbd0f57f546d46c5a9659fb12f1740042966 Author: Simon Richter <simon.rich...@hogyros.de> AuthorDate: Sun Sep 6 18:35:37 2015 +0200 Commit: Brad King <brad.k...@kitware.com> CommitDate: Wed Sep 9 10:20:18 2015 -0400 FindwxWidgets: Expect wxWidgets 3.1 diff --git a/Modules/FindwxWidgets.cmake b/Modules/FindwxWidgets.cmake index 0c95529..52aafd7 100644 --- a/Modules/FindwxWidgets.cmake +++ b/Modules/FindwxWidgets.cmake @@ -302,6 +302,7 @@ if(wxWidgets_FIND_STYLE STREQUAL "win32") # Find wxWidgets multilib base libraries. find_library(WX_base${_DBG} NAMES + wxbase31${_UCD}${_DBG} wxbase30${_UCD}${_DBG} wxbase29${_UCD}${_DBG} wxbase28${_UCD}${_DBG} @@ -315,6 +316,7 @@ if(wxWidgets_FIND_STYLE STREQUAL "win32") foreach(LIB net odbc xml) find_library(WX_${LIB}${_DBG} NAMES + wxbase31${_UCD}${_DBG}_${LIB} wxbase30${_UCD}${_DBG}_${LIB} wxbase29${_UCD}${_DBG}_${LIB} wxbase28${_UCD}${_DBG}_${LIB} @@ -330,6 +332,7 @@ if(wxWidgets_FIND_STYLE STREQUAL "win32") # Find wxWidgets monolithic library. find_library(WX_mono${_DBG} NAMES + wxmsw${_UNV}31${_UCD}${_DBG} wxmsw${_UNV}30${_UCD}${_DBG} wxmsw${_UNV}29${_UCD}${_DBG} wxmsw${_UNV}28${_UCD}${_DBG} @@ -346,6 +349,7 @@ if(wxWidgets_FIND_STYLE STREQUAL "win32") stc ribbon propgrid webview) find_library(WX_${LIB}${_DBG} NAMES + wxmsw${_UNV}31${_UCD}${_DBG}_${LIB} wxmsw${_UNV}30${_UCD}${_DBG}_${LIB} wxmsw${_UNV}29${_UCD}${_DBG}_${LIB} wxmsw${_UNV}28${_UCD}${_DBG}_${LIB} @@ -741,7 +745,7 @@ else() #----------------------------------------------------------------- # Support cross-compiling, only search in the target platform. find_program(wxWidgets_CONFIG_EXECUTABLE - NAMES wx-config wx-config-3.0 wx-config-2.9 wx-config-2.8 + NAMES wx-config wx-config-3.1 wx-config-3.0 wx-config-2.9 wx-config-2.8 DOC "Location of wxWidgets library configuration provider binary (wx-config)." ONLY_CMAKE_FIND_ROOT_PATH ) http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6089fde554aedb4888c7114fa433d14375b8a213 commit 6089fde554aedb4888c7114fa433d14375b8a213 Author: Simon Richter <simon.rich...@hogyros.de> AuthorDate: Sun Sep 6 18:35:36 2015 +0200 Commit: Brad King <brad.k...@kitware.com> CommitDate: Wed Sep 9 10:20:08 2015 -0400 FindwxWidgets: allow specifying required version diff --git a/Modules/FindwxWidgets.cmake b/Modules/FindwxWidgets.cmake index 9a70678..0c95529 100644 --- a/Modules/FindwxWidgets.cmake +++ b/Modules/FindwxWidgets.cmake @@ -857,6 +857,28 @@ else() endif() endif() +# Check if a specfic version was requested by find_package(). +if(wxWidgets_FOUND) + find_file(_filename wx/version.h PATHS ${wxWidgets_INCLUDE_DIRS} NO_DEFAULT_PATH) + dbg_msg("_filename: ${_filename}") + + if(NOT _filename) + message(FATAL_ERROR "wxWidgets wx/version.h file not found in ${wxWidgets_INCLUDE_DIRS}.") + endif() + + file(READ ${_filename} _wx_version_h) + + string(REGEX REPLACE "^(.*\n)?#define +wxMAJOR_VERSION +([0-9]+).*" + "\\2" wxWidgets_VERSION_MAJOR "${_wx_version_h}" ) + string(REGEX REPLACE "^(.*\n)?#define +wxMINOR_VERSION +([0-9]+).*" + "\\2" wxWidgets_VERSION_MINOR "${_wx_version_h}" ) + string(REGEX REPLACE "^(.*\n)?#define +wxRELEASE_NUMBER +([0-9]+).*" + "\\2" wxWidgets_VERSION_PATCH "${_wx_version_h}" ) + set(wxWidgets_VERSION_STRING + "${wxWidgets_VERSION_MAJOR}.${wxWidgets_VERSION_MINOR}.${wxWidgets_VERSION_PATCH}" ) + dbg_msg("wxWidgets_VERSION_STRING: ${wxWidgets_VERSION_STRING}") +endif() + # Debug output: DBG_MSG("wxWidgets_FOUND : ${wxWidgets_FOUND}") DBG_MSG("wxWidgets_INCLUDE_DIRS : ${wxWidgets_INCLUDE_DIRS}") @@ -867,10 +889,13 @@ DBG_MSG("wxWidgets_USE_FILE : ${wxWidgets_USE_FILE}") #===================================================================== #===================================================================== + include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(wxWidgets DEFAULT_MSG wxWidgets_FOUND) -# Maintain consistency with all other variables. -set(wxWidgets_FOUND ${WXWIDGETS_FOUND}) + +find_package_handle_standard_args(wxWidgets + REQUIRED_VARS wxWidgets_LIBRARIES wxWidgets_INCLUDE_DIRS + VERSION_VAR wxWidgets_VERSION_STRING + ) #===================================================================== # Macros for use in wxWidgets apps. ----------------------------------------------------------------------- Summary of changes: Modules/FindwxWidgets.cmake | 39 ++++++++++++++++++++++++++++++++++----- 1 file changed, 34 insertions(+), 5 deletions(-) hooks/post-receive -- CMake _______________________________________________ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits