kicad-developers team mailing list archive
-
kicad-developers team
-
Mailing list archive
-
Message #14768
wxWidgets version testing.
I have updated our custom FindwxWidgets.cmake file to perform version
checks if a version is specified in find_package(). I currently have
the minimum required version of wxWidgets at 3.0.0. I could move it
back to 2.9.5 if there is any good reason to do so but I would rather
not. I've tested in on Windows using MSYS/MinGW and Debian Testing
x86_64 and it works fine. I would like someone with OSX to please test
it before I commit it. I used the stock CMake
find_package_handle_standard_args() to validate the wxWidgets version
found instead of our custom check_find_package_result() which is
inadequate for the task at hand (I'm not sure why we are event using it
instead of find_package_handle_standard_args). It looks like the OSX
stuff is doing something outside of this (AFAICT it shouldn't be doing
it this way) so I want to make sure I haven't broken anything before I
commit the change. It might also be a good idea to test it on
kicad-winbuilder as well. Please let me know if you find any issues. I
want to get this committed and end wx 2.8 support.
Thanks,
Wayne
=== modified file 'CMakeLists.txt'
--- CMakeLists.txt 2014-09-17 16:04:04 +0000
+++ CMakeLists.txt 2014-09-17 23:35:33 +0000
@@ -505,13 +505,9 @@
# On Apple only wxwidgets 2.9 or higher doesn't need to find aui part of base
# Seems no more needed on wx-3
if( APPLE AND ( KICAD_SCRIPTING OR KICAD_SCRIPTING_MODULES OR KICAD_SCRIPTING_WXPYTHON) )
- find_package( wxWidgets COMPONENTS gl adv html core net base xml QUIET )
+ find_package( wxWidgets 3.0.0 COMPONENTS gl adv html core net base xml REQUIRED )
else()
- find_package( wxWidgets COMPONENTS gl aui adv html core net base xml QUIET )
-endif()
-
-if( NOT (KICAD_BUILD_STATIC OR KICAD_BUILD_DYNAMIC) )
- check_find_package_result( wxWidgets_FOUND "wxWidgets" )
+ find_package( wxWidgets 3.0.0 COMPONENTS gl aui adv html core net base xml REQUIRED )
endif()
# Include wxWidgets macros.
=== removed file 'CMakeModules/FindPackageHandleStandardArgs.cmake'
--- CMakeModules/FindPackageHandleStandardArgs.cmake 2013-08-04 20:31:14 +0000
+++ CMakeModules/FindPackageHandleStandardArgs.cmake 1970-01-01 00:00:00 +0000
@@ -1,260 +0,0 @@
-# FIND_PACKAGE_HANDLE_STANDARD_ARGS(<name> ... )
-#
-# This function is intended to be used in FindXXX.cmake modules files.
-# It handles the REQUIRED, QUIET and version-related arguments to FIND_PACKAGE().
-# It also sets the <UPPERCASED_NAME>_FOUND variable.
-# The package is considered found if all variables <var1>... listed contain
-# valid results, e.g. valid filepaths.
-#
-# There are two modes of this function. The first argument in both modes is
-# the name of the Find-module where it is called (in original casing).
-#
-# The first simple mode looks like this:
-# FIND_PACKAGE_HANDLE_STANDARD_ARGS(<name> (DEFAULT_MSG|"Custom failure message") <var1>...<varN> )
-# If the variables <var1> to <varN> are all valid, then <UPPERCASED_NAME>_FOUND
-# will be set to TRUE.
-# If DEFAULT_MSG is given as second argument, then the function will generate
-# itself useful success and error messages. You can also supply a custom error message
-# for the failure case. This is not recommended.
-#
-# The second mode is more powerful and also supports version checking:
-# FIND_PACKAGE_HANDLE_STANDARD_ARGS(NAME [REQUIRED_VARS <var1>...<varN>]
-# [VERSION_VAR <versionvar>
-# [CONFIG_MODE]
-# [FAIL_MESSAGE "Custom failure message"] )
-#
-# As above, if <var1> through <varN> are all valid, <UPPERCASED_NAME>_FOUND
-# will be set to TRUE.
-# After REQUIRED_VARS the variables which are required for this package are listed.
-# Following VERSION_VAR the name of the variable can be specified which holds
-# the version of the package which has been found. If this is done, this version
-# will be checked against the (potentially) specified required version used
-# in the find_package() call. The EXACT keyword is also handled. The default
-# messages include information about the required version and the version
-# which has been actually found, both if the version is ok or not.
-# Use the option CONFIG_MODE if your FindXXX.cmake module is a wrapper for
-# a find_package(... NO_MODULE) call, in this case all the information
-# provided by the config-mode of find_package() will be evaluated
-# automatically.
-# Via FAIL_MESSAGE a custom failure message can be specified, if this is not
-# used, the default message will be displayed.
-#
-# Example for mode 1:
-#
-# FIND_PACKAGE_HANDLE_STANDARD_ARGS(LibXml2 DEFAULT_MSG LIBXML2_LIBRARY LIBXML2_INCLUDE_DIR)
-#
-# LibXml2 is considered to be found, if both LIBXML2_LIBRARY and
-# LIBXML2_INCLUDE_DIR are valid. Then also LIBXML2_FOUND is set to TRUE.
-# If it is not found and REQUIRED was used, it fails with FATAL_ERROR,
-# independent whether QUIET was used or not.
-# If it is found, success will be reported, including the content of <var1>.
-# On repeated Cmake runs, the same message won't be printed again.
-#
-# Example for mode 2:
-#
-# FIND_PACKAGE_HANDLE_STANDARD_ARGS(BISON REQUIRED_VARS BISON_EXECUTABLE
-# VERSION_VAR BISON_VERSION)
-# In this case, BISON is considered to be found if the variable(s) listed
-# after REQUIRED_VAR are all valid, i.e. BISON_EXECUTABLE in this case.
-# Also the version of BISON will be checked by using the version contained
-# in BISON_VERSION.
-# Since no FAIL_MESSAGE is given, the default messages will be printed.
-#
-# Another example for mode 2:
-#
-# FIND_PACKAGE(Automoc4 QUIET NO_MODULE HINTS /opt/automoc4)
-# FIND_PACKAGE_HANDLE_STANDARD_ARGS(Automoc4 CONFIG_MODE)
-# In this case, FindAutmoc4.cmake wraps a call to FIND_PACKAGE(Automoc4 NO_MODULE)
-# and adds an additional search directory for automoc4.
-# The following FIND_PACKAGE_HANDLE_STANDARD_ARGS() call produces a proper
-# success/error message.
-
-#=============================================================================
-# Copyright 2007-2009 Kitware, Inc.
-#
-# Distributed under the OSI-approved BSD License (the "License");
-# see accompanying file Copyright.txt for details.
-#
-# This software is distributed WITHOUT ANY WARRANTY; without even the
-# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-# See the License for more information.
-#=============================================================================
-# (To distribute this file outside of CMake, substitute the full
-# License text for the above reference.)
-
-INCLUDE(FindPackageMessage)
-INCLUDE(CMakeParseArguments)
-
-# internal helper macro
-MACRO(_FPHSA_FAILURE_MESSAGE _msg)
- IF (${_NAME}_FIND_REQUIRED)
- MESSAGE(FATAL_ERROR "${_msg}")
- ELSE (${_NAME}_FIND_REQUIRED)
- IF (NOT ${_NAME}_FIND_QUIETLY)
- MESSAGE(STATUS "${_msg}")
- ENDIF (NOT ${_NAME}_FIND_QUIETLY)
- ENDIF (${_NAME}_FIND_REQUIRED)
-ENDMACRO(_FPHSA_FAILURE_MESSAGE _msg)
-
-
-# internal helper macro to generate the failure message when used in CONFIG_MODE:
-MACRO(_FPHSA_HANDLE_FAILURE_CONFIG_MODE)
- # <name>_CONFIG is set, but FOUND is false, this means that some other of the REQUIRED_VARS was not found:
- IF(${_NAME}_CONFIG)
- _FPHSA_FAILURE_MESSAGE("${FPHSA_FAIL_MESSAGE}: missing: ${MISSING_VARS} (found ${${_NAME}_CONFIG} ${VERSION_MSG})")
- ELSE(${_NAME}_CONFIG)
- # If _CONSIDERED_CONFIGS is set, the config-file has been found, but no suitable version.
- # List them all in the error message:
- IF(${_NAME}_CONSIDERED_CONFIGS)
- SET(configsText "")
- LIST(LENGTH ${_NAME}_CONSIDERED_CONFIGS configsCount)
- MATH(EXPR configsCount "${configsCount} - 1")
- FOREACH(currentConfigIndex RANGE ${configsCount})
- LIST(GET ${_NAME}_CONSIDERED_CONFIGS ${currentConfigIndex} filename)
- LIST(GET ${_NAME}_CONSIDERED_VERSIONS ${currentConfigIndex} version)
- SET(configsText "${configsText} ${filename} (version ${version})\n")
- ENDFOREACH(currentConfigIndex)
- _FPHSA_FAILURE_MESSAGE("${FPHSA_FAIL_MESSAGE} ${VERSION_MSG}, checked the following files:\n${configsText}")
-
- ELSE(${_NAME}_CONSIDERED_CONFIGS)
- # Simple case: No Config-file was found at all:
- _FPHSA_FAILURE_MESSAGE("${FPHSA_FAIL_MESSAGE}: found neither ${_NAME}Config.cmake nor ${_NAME_LOWER}-config.cmake ${VERSION_MSG}")
- ENDIF(${_NAME}_CONSIDERED_CONFIGS)
- ENDIF(${_NAME}_CONFIG)
-ENDMACRO(_FPHSA_HANDLE_FAILURE_CONFIG_MODE)
-
-
-FUNCTION(FIND_PACKAGE_HANDLE_STANDARD_ARGS _NAME _FIRST_ARG)
-
-# set up the arguments for CMAKE_PARSE_ARGUMENTS and check whether we are in
-# new extended or in the "old" mode:
- SET(options CONFIG_MODE)
- SET(oneValueArgs FAIL_MESSAGE VERSION_VAR)
- SET(multiValueArgs REQUIRED_VARS)
- SET(_KEYWORDS_FOR_EXTENDED_MODE ${options} ${oneValueArgs} ${multiValueArgs} )
- LIST(FIND _KEYWORDS_FOR_EXTENDED_MODE "${_FIRST_ARG}" INDEX)
-
- IF(${INDEX} EQUAL -1)
- SET(FPHSA_FAIL_MESSAGE ${_FIRST_ARG})
- SET(FPHSA_REQUIRED_VARS ${ARGN})
- SET(FPHSA_VERSION_VAR)
- ELSE(${INDEX} EQUAL -1)
-
- CMAKE_PARSE_ARGUMENTS(FPHSA "${options}" "${oneValueArgs}" "${multiValueArgs}" ${_FIRST_ARG} ${ARGN})
-
- IF(FPHSA_UNPARSED_ARGUMENTS)
- MESSAGE(FATAL_ERROR "Unknown keywords given to FIND_PACKAGE_HANDLE_STANDARD_ARGS(): \"${FPHSA_UNPARSED_ARGUMENTS}\"")
- ENDIF(FPHSA_UNPARSED_ARGUMENTS)
-
- IF(NOT FPHSA_FAIL_MESSAGE)
- SET(FPHSA_FAIL_MESSAGE "DEFAULT_MSG")
- ENDIF(NOT FPHSA_FAIL_MESSAGE)
- ENDIF(${INDEX} EQUAL -1)
-
-# now that we collected all arguments, process them
-
- IF("${FPHSA_FAIL_MESSAGE}" STREQUAL "DEFAULT_MSG")
- SET(FPHSA_FAIL_MESSAGE "Could NOT find ${_NAME}")
- ENDIF("${FPHSA_FAIL_MESSAGE}" STREQUAL "DEFAULT_MSG")
-
- # In config-mode, we rely on the variable <package>_CONFIG, which is set by find_package()
- # when it successfully found the config-file, including version checking:
- IF(FPHSA_CONFIG_MODE)
- LIST(INSERT FPHSA_REQUIRED_VARS 0 ${_NAME}_CONFIG)
- LIST(REMOVE_DUPLICATES FPHSA_REQUIRED_VARS)
- SET(FPHSA_VERSION_VAR ${_NAME}_VERSION)
- ENDIF(FPHSA_CONFIG_MODE)
-
- IF(NOT FPHSA_REQUIRED_VARS)
- MESSAGE(FATAL_ERROR "No REQUIRED_VARS specified for FIND_PACKAGE_HANDLE_STANDARD_ARGS()")
- ENDIF(NOT FPHSA_REQUIRED_VARS)
-
- LIST(GET FPHSA_REQUIRED_VARS 0 _FIRST_REQUIRED_VAR)
-
- STRING(TOUPPER ${_NAME} _NAME_UPPER)
- STRING(TOLOWER ${_NAME} _NAME_LOWER)
-
- # collect all variables which were not found, so they can be printed, so the
- # user knows better what went wrong (#6375)
- SET(MISSING_VARS "")
- SET(DETAILS "")
- SET(${_NAME_UPPER}_FOUND TRUE)
- # check if all passed variables are valid
- FOREACH(_CURRENT_VAR ${FPHSA_REQUIRED_VARS})
- IF(NOT ${_CURRENT_VAR})
- SET(${_NAME_UPPER}_FOUND FALSE)
- SET(MISSING_VARS "${MISSING_VARS} ${_CURRENT_VAR}")
- ELSE(NOT ${_CURRENT_VAR})
- SET(DETAILS "${DETAILS}[${${_CURRENT_VAR}}]")
- ENDIF(NOT ${_CURRENT_VAR})
- ENDFOREACH(_CURRENT_VAR)
-
-
- # version handling:
- SET(VERSION_MSG "")
- SET(VERSION_OK TRUE)
- SET(VERSION ${${FPHSA_VERSION_VAR}} )
- IF (${_NAME}_FIND_VERSION)
-
- IF(VERSION)
-
- IF(${_NAME}_FIND_VERSION_EXACT) # exact version required
- IF (NOT "${${_NAME}_FIND_VERSION}" VERSION_EQUAL "${VERSION}")
- SET(VERSION_MSG "Found unsuitable version \"${VERSION}\", but required is exact version \"${${_NAME}_FIND_VERSION}\"")
- SET(VERSION_OK FALSE)
- ELSE (NOT "${${_NAME}_FIND_VERSION}" VERSION_EQUAL "${VERSION}")
- SET(VERSION_MSG "(found suitable exact version \"${VERSION}\")")
- ENDIF (NOT "${${_NAME}_FIND_VERSION}" VERSION_EQUAL "${VERSION}")
-
- ELSE(${_NAME}_FIND_VERSION_EXACT) # minimum version specified:
- IF ("${${_NAME}_FIND_VERSION}" VERSION_GREATER "${VERSION}")
- SET(VERSION_MSG "Found unsuitable version \"${VERSION}\", but required is at least \"${${_NAME}_FIND_VERSION}\"")
- SET(VERSION_OK FALSE)
- ELSE ("${${_NAME}_FIND_VERSION}" VERSION_GREATER "${VERSION}")
- SET(VERSION_MSG "(found suitable version \"${VERSION}\", required is \"${${_NAME}_FIND_VERSION}\")")
- ENDIF ("${${_NAME}_FIND_VERSION}" VERSION_GREATER "${VERSION}")
- ENDIF(${_NAME}_FIND_VERSION_EXACT)
-
- ELSE(VERSION)
-
- # if the package was not found, but a version was given, add that to the output:
- IF(${_NAME}_FIND_VERSION_EXACT)
- SET(VERSION_MSG "(Required is exact version \"${${_NAME}_FIND_VERSION}\")")
- ELSE(${_NAME}_FIND_VERSION_EXACT)
- SET(VERSION_MSG "(Required is at least version \"${${_NAME}_FIND_VERSION}\")")
- ENDIF(${_NAME}_FIND_VERSION_EXACT)
-
- ENDIF(VERSION)
- ELSE (${_NAME}_FIND_VERSION)
- IF(VERSION)
- SET(VERSION_MSG "(found version \"${VERSION}\")")
- ENDIF(VERSION)
- ENDIF (${_NAME}_FIND_VERSION)
-
- IF(VERSION_OK)
- SET(DETAILS "${DETAILS}[v${VERSION}(${${_NAME}_FIND_VERSION})]")
- ELSE(VERSION_OK)
- SET(${_NAME_UPPER}_FOUND FALSE)
- ENDIF(VERSION_OK)
-
-
- # print the result:
- IF (${_NAME_UPPER}_FOUND)
- FIND_PACKAGE_MESSAGE(${_NAME} "Found ${_NAME}: ${${_FIRST_REQUIRED_VAR}} ${VERSION_MSG}" "${DETAILS}")
- ELSE (${_NAME_UPPER}_FOUND)
-
- IF(FPHSA_CONFIG_MODE)
- _FPHSA_HANDLE_FAILURE_CONFIG_MODE()
- ELSE(FPHSA_CONFIG_MODE)
- IF(NOT VERSION_OK)
- _FPHSA_FAILURE_MESSAGE("${FPHSA_FAIL_MESSAGE}: ${VERSION_MSG} (found ${${_FIRST_REQUIRED_VAR}})")
- ELSE(NOT VERSION_OK)
- _FPHSA_FAILURE_MESSAGE("${FPHSA_FAIL_MESSAGE} (missing: ${MISSING_VARS}) ${VERSION_MSG}")
- ENDIF(NOT VERSION_OK)
- ENDIF(FPHSA_CONFIG_MODE)
-
- ENDIF (${_NAME_UPPER}_FOUND)
-
- SET(${_NAME_UPPER}_FOUND ${${_NAME_UPPER}_FOUND} PARENT_SCOPE)
-
-ENDFUNCTION(FIND_PACKAGE_HANDLE_STANDARD_ARGS _FIRST_ARG)
=== modified file 'CMakeModules/FindwxWidgets.cmake'
--- CMakeModules/FindwxWidgets.cmake 2014-08-22 20:40:17 +0000
+++ CMakeModules/FindwxWidgets.cmake 2014-09-18 21:27:38 +0000
@@ -4,7 +4,7 @@
# modules that you will use, you need to name them as components to
# the package:
#
-# FIND_PACKAGE(wxWidgets COMPONENTS core base ...)
+# find_package(wxWidgets COMPONENTS core base ...)
#
# There are two search branches: a windows style and a unix style. For
# windows, the following variables are searched for and set to
@@ -38,7 +38,7 @@
# example, to use the base toolkit found in the /usr/local path, set
# the variable (before calling the FIND_PACKAGE command) as such:
#
-# SET(wxWidgets_CONFIG_OPTIONS --toolkit=base --prefix=/usr)
+# set(wxWidgets_CONFIG_OPTIONS --toolkit=base --prefix=/usr)
#
# The following are set after the configuration is done for both
# windows and unix style:
@@ -62,19 +62,25 @@
#
# Sample usage:
# # Note that for MinGW users the order of libs is important!
-# FIND_PACKAGE(wxWidgets COMPONENTS net gl core base)
-# IF(wxWidgets_FOUND)
-# INCLUDE(${wxWidgets_USE_FILE})
+# find_package(wxWidgets COMPONENTS net gl core base)
+# if(wxWidgets_FOUND)
+# include(${wxWidgets_USE_FILE})
# # and for each of your dependent executable/library targets:
-# TARGET_LINK_LIBRARIES(<YourTarget> ${wxWidgets_LIBRARIES})
-# ENDIF(wxWidgets_FOUND)
+# target_link_libraries(<YourTarget> ${wxWidgets_LIBRARIES})
+# endif(wxWidgets_FOUND)
#
# If wxWidgets is required (i.e., not an optional part):
-# FIND_PACKAGE(wxWidgets REQUIRED net gl core base)
-# INCLUDE(${wxWidgets_USE_FILE})
+# find_package(wxWidgets REQUIRED net gl core base)
+# include(${wxWidgets_USE_FILE})
# # and for each of your dependent executable/library targets:
-# TARGET_LINK_LIBRARIES(<YourTarget> ${wxWidgets_LIBRARIES})
-
+# target_link_libraries(<YourTarget> ${wxWidgets_LIBRARIES})
+#
+# If a wxWidgets version or greater is required:
+# find_package(wxWidgets 2.8.12 COMPONENTS net gl core base REQUIRED)
+#
+# If specific wxWidgets version is required:
+# find_package(wxWidgets 2.8.12 EXACT COMPONENTS net gl core base REQUIRED)
+#
#=============================================================================
# Copyright 2004-2009 Kitware, Inc.
# Copyright 2007-2009 Miguel A. Figueroa-Villanueva <miguelf at ieee dot org>
@@ -94,7 +100,7 @@
# Remember to connect back to the upper text.
# Sample usage with monolithic wx build:
#
-# FIND_PACKAGE(wxWidgets COMPONENTS mono)
+# find_package(wxWidgets COMPONENTS mono)
# ...
# NOTES
@@ -138,24 +144,24 @@
# checking whether a minimal set was found.
-# FIXME: This and all the DBG_MSG calls should be removed after the
+# FIXME: This and all the dbg_msg calls should be removed after the
# module stabilizes.
#
# Helper macro to control the debugging output globally. There are
# two versions for controlling how verbose your output should be.
-MACRO(DBG_MSG _MSG)
-# MESSAGE(WARNING "${_MSG}")
-ENDMACRO(DBG_MSG)
-MACRO(DBG_MSG_V _MSG)
-# MESSAGE(WARNING "${_MSG}")
-ENDMACRO(DBG_MSG_V)
+macro(dbg_msg _MSG)
+# message(STATUS "${_MSG}")
+endmacro(dbg_msg)
+macro(dbg_msg_v _MSG)
+# message(STATUS "${_MSG}")
+endmacro(dbg_msg_v)
# Clear return values in case the module is loaded more than once.
-SET(wxWidgets_FOUND FALSE)
-SET(wxWidgets_INCLUDE_DIRS "")
-SET(wxWidgets_LIBRARIES "")
-SET(wxWidgets_LIBRARY_DIRS "")
-SET(wxWidgets_CXX_FLAGS "")
+set(wxWidgets_FOUND FALSE)
+set(wxWidgets_INCLUDE_DIRS "")
+set(wxWidgets_LIBRARIES "")
+set(wxWidgets_LIBRARY_DIRS "")
+set(wxWidgets_CXX_FLAGS "")
# Using SYSTEM with INCLUDE_DIRECTORIES in conjunction with wxWidgets on
# the Mac produces compiler errors. Set wxWidgets_INCLUDE_DIRS_NO_SYSTEM
@@ -165,9 +171,9 @@
# http://www.cmake.org/pipermail/cmake/2008-April/021115.html
# http://www.cmake.org/pipermail/cmake/2008-April/021146.html
#
-IF(APPLE)
- SET(wxWidgets_INCLUDE_DIRS_NO_SYSTEM 1)
-ENDIF(APPLE)
+if(APPLE)
+ set(wxWidgets_INCLUDE_DIRS_NO_SYSTEM 1)
+endif(APPLE)
# DEPRECATED: This is a patch to support the DEPRECATED use of
# wxWidgets_USE_LIBS.
@@ -175,66 +181,66 @@
# If wxWidgets_USE_LIBS is set:
# - if using <components>, then override wxWidgets_USE_LIBS
# - else set wxWidgets_FIND_COMPONENTS to wxWidgets_USE_LIBS
-IF(wxWidgets_USE_LIBS AND NOT wxWidgets_FIND_COMPONENTS)
- SET(wxWidgets_FIND_COMPONENTS ${wxWidgets_USE_LIBS})
-ENDIF(wxWidgets_USE_LIBS AND NOT wxWidgets_FIND_COMPONENTS)
-DBG_MSG("wxWidgets_FIND_COMPONENTS : ${wxWidgets_FIND_COMPONENTS}")
+if(wxWidgets_USE_LIBS AND NOT wxWidgets_FIND_COMPONENTS)
+ set(wxWidgets_FIND_COMPONENTS ${wxWidgets_USE_LIBS})
+endif(wxWidgets_USE_LIBS AND NOT wxWidgets_FIND_COMPONENTS)
+dbg_msg("wxWidgets_FIND_COMPONENTS : ${wxWidgets_FIND_COMPONENTS}")
# Add the convenience use file if available.
#
# Get dir of this file which may reside in:
# - CMAKE_MAKE_ROOT/Modules on CMake installation
# - CMAKE_MODULE_PATH if user prefers his own specialized version
-SET(wxWidgets_USE_FILE "")
-GET_FILENAME_COMPONENT(
+set(wxWidgets_USE_FILE "")
+get_filename_component(
wxWidgets_CURRENT_LIST_DIR ${CMAKE_CURRENT_LIST_FILE} PATH)
# Prefer an existing customized version, but the user might override
# the FindwxWidgets module and not the UsewxWidgets one.
-IF(EXISTS "${wxWidgets_CURRENT_LIST_DIR}/UsewxWidgets.cmake")
- SET(wxWidgets_USE_FILE
+if(EXISTS "${wxWidgets_CURRENT_LIST_DIR}/UsewxWidgets.cmake")
+ set(wxWidgets_USE_FILE
"${wxWidgets_CURRENT_LIST_DIR}/UsewxWidgets.cmake")
-ELSE(EXISTS "${wxWidgets_CURRENT_LIST_DIR}/UsewxWidgets.cmake")
- SET(wxWidgets_USE_FILE UsewxWidgets)
-ENDIF(EXISTS "${wxWidgets_CURRENT_LIST_DIR}/UsewxWidgets.cmake")
-
-#=====================================================================
-#=====================================================================
-
-
-IF(WIN32 AND NOT CYGWIN AND NOT MSYS AND NOT CMAKE_HOST_UNIX )
- DBG_MSG( "setting win32 style" )
- SET(wxWidgets_FIND_STYLE "win32")
-ELSE()
- IF(CMAKE_HOST_UNIX OR MSYS)
- DBG_MSG( "unix style" )
- SET(wxWidgets_FIND_STYLE "unix")
- ENDIF()
-ENDIF()
+else(EXISTS "${wxWidgets_CURRENT_LIST_DIR}/UsewxWidgets.cmake")
+ set(wxWidgets_USE_FILE UsewxWidgets)
+endif(EXISTS "${wxWidgets_CURRENT_LIST_DIR}/UsewxWidgets.cmake")
+
+#=====================================================================
+#=====================================================================
+
+
+if(WIN32 AND NOT CYGWIN AND NOT MSYS AND NOT CMAKE_HOST_UNIX )
+ dbg_msg( "setting win32 style" )
+ set(wxWidgets_FIND_STYLE "win32")
+else()
+ if(CMAKE_HOST_UNIX OR MSYS)
+ dbg_msg( "unix style" )
+ set(wxWidgets_FIND_STYLE "unix")
+ endif()
+endif()
#=====================================================================
# WIN32_FIND_STYLE
#=====================================================================
-IF(wxWidgets_FIND_STYLE STREQUAL "win32")
- DBG_MSG("Using win32 path")
+if(wxWidgets_FIND_STYLE STREQUAL "win32")
+ dbg_msg("Using win32 path")
# Useful common wx libs needed by almost all components.
- SET(wxWidgets_COMMON_LIBRARIES png tiff jpeg zlib regex expat)
+ set(wxWidgets_COMMON_LIBRARIES png tiff jpeg zlib regex expat)
- # DEPRECATED: Use FIND_PACKAGE(wxWidgets COMPONENTS mono) instead.
- IF(NOT wxWidgets_FIND_COMPONENTS)
- IF(wxWidgets_USE_MONOLITHIC)
- SET(wxWidgets_FIND_COMPONENTS mono)
- ELSE(wxWidgets_USE_MONOLITHIC)
- SET(wxWidgets_FIND_COMPONENTS core base) # this is default
- ENDIF(wxWidgets_USE_MONOLITHIC)
- ENDIF(NOT wxWidgets_FIND_COMPONENTS)
+ # DEPRECATED: Use find_package(wxWidgets COMPONENTS mono) instead.
+ if(NOT wxWidgets_FIND_COMPONENTS)
+ if(wxWidgets_USE_MONOLITHIC)
+ set(wxWidgets_FIND_COMPONENTS mono)
+ else(wxWidgets_USE_MONOLITHIC)
+ set(wxWidgets_FIND_COMPONENTS core base) # this is default
+ endif(wxWidgets_USE_MONOLITHIC)
+ endif(NOT wxWidgets_FIND_COMPONENTS)
# Add the common (usually required libs) unless
# wxWidgets_EXCLUDE_COMMON_LIBRARIES has been set.
- IF(NOT wxWidgets_EXCLUDE_COMMON_LIBRARIES)
- LIST(APPEND wxWidgets_FIND_COMPONENTS
+ if(NOT wxWidgets_EXCLUDE_COMMON_LIBRARIES)
+ list(APPEND wxWidgets_FIND_COMPONENTS
${wxWidgets_COMMON_LIBRARIES})
- ENDIF(NOT wxWidgets_EXCLUDE_COMMON_LIBRARIES)
+ endif(NOT wxWidgets_EXCLUDE_COMMON_LIBRARIES)
#-------------------------------------------------------------------
# WIN32: Helper MACROS
@@ -244,41 +250,41 @@
# if _CONFIGURATION = mswunivud, then _UNV=univ, _UCD=u _DBG=d
# if _CONFIGURATION = mswu, then _UNV="", _UCD=u _DBG=""
#
- MACRO(WX_GET_NAME_COMPONENTS _CONFIGURATION _UNV _UCD _DBG)
- STRING(REGEX MATCH "univ" ${_UNV} "${_CONFIGURATION}")
- STRING(REGEX REPLACE "msw.*(u)[d]*$" "u" ${_UCD} "${_CONFIGURATION}")
- IF(${_UCD} STREQUAL ${_CONFIGURATION})
- SET(${_UCD} "")
- ENDIF(${_UCD} STREQUAL ${_CONFIGURATION})
- STRING(REGEX MATCH "d$" ${_DBG} "${_CONFIGURATION}")
- ENDMACRO(WX_GET_NAME_COMPONENTS)
+ macro(wx_get_name_components _CONFIGURATION _UNV _UCD _DBG)
+ string(REGEX MATCH "univ" ${_UNV} "${_CONFIGURATION}")
+ string(REGEX REPLACE "msw.*(u)[d]*$" "u" ${_UCD} "${_CONFIGURATION}")
+ if(${_UCD} STREQUAL ${_CONFIGURATION})
+ set(${_UCD} "")
+ endif(${_UCD} STREQUAL ${_CONFIGURATION})
+ string(REGEX MATCH "d$" ${_DBG} "${_CONFIGURATION}")
+ endmacro(wx_get_name_components)
#
# Find libraries associated to a configuration.
#
- MACRO(WX_FIND_LIBS _UNV _UCD _DBG)
- DBG_MSG_V("m_unv = ${_UNV}")
- DBG_MSG_V("m_ucd = ${_UCD}")
- DBG_MSG_V("m_dbg = ${_DBG}")
+ macro(wx_find_libs _UNV _UCD _DBG)
+ dbg_msg_v("m_unv = ${_UNV}")
+ dbg_msg_v("m_ucd = ${_UCD}")
+ dbg_msg_v("m_dbg = ${_DBG}")
# FIXME: What if both regex libs are available. regex should be
# found outside the loop and only wx${LIB}${_UCD}${_DBG}.
# Find wxWidgets common libraries.
- FOREACH(LIB ${wxWidgets_COMMON_LIBRARIES} scintilla)
- FIND_LIBRARY(WX_${LIB}${_DBG}
+ foreach(LIB ${wxWidgets_COMMON_LIBRARIES} scintilla)
+ find_library(WX_${LIB}${_DBG}
NAMES
wx${LIB}${_UCD}${_DBG} # for regex
wx${LIB}${_DBG}
PATHS ${WX_LIB_DIR}
NO_DEFAULT_PATH
)
- MARK_AS_ADVANCED(WX_${LIB}${_DBG})
- ENDFOREACH(LIB)
+ mark_as_advanced(WX_${LIB}${_DBG})
+ endforeach(LIB)
- DBG_MSG( "WX_LIB_DIR:${WX_LIB_DIR}" )
+ dbg_msg( "WX_LIB_DIR:${WX_LIB_DIR}" )
# Find wxWidgets multilib base libraries.
- FIND_LIBRARY(WX_base${_DBG}
+ find_library(WX_base${_DBG}
NAMES
wxbase31${_UCD}${_DBG}
wxbase30${_UCD}${_DBG}
@@ -290,9 +296,9 @@
PATHS ${WX_LIB_DIR}
NO_DEFAULT_PATH
)
- MARK_AS_ADVANCED(WX_base${_DBG})
- FOREACH(LIB net odbc xml)
- FIND_LIBRARY(WX_${LIB}${_DBG}
+ mark_as_advanced(WX_base${_DBG})
+ foreach(LIB net odbc xml)
+ find_library(WX_${LIB}${_DBG}
NAMES
wxbase31${_UCD}${_DBG}_${LIB}
wxbase30${_UCD}${_DBG}_${LIB}
@@ -304,11 +310,11 @@
PATHS ${WX_LIB_DIR}
NO_DEFAULT_PATH
)
- MARK_AS_ADVANCED(WX_${LIB}${_DBG})
- ENDFOREACH(LIB)
+ mark_as_advanced(WX_${LIB}${_DBG})
+ endforeach(LIB)
# Find wxWidgets monolithic library.
- FIND_LIBRARY(WX_mono${_DBG}
+ find_library(WX_mono${_DBG}
NAMES
wxmsw${_UNV}31${_UCD}${_DBG}
wxmsw${_UNV}30${_UCD}${_DBG}
@@ -320,12 +326,12 @@
PATHS ${WX_LIB_DIR}
NO_DEFAULT_PATH
)
- MARK_AS_ADVANCED(WX_mono${_DBG})
+ mark_as_advanced(WX_mono${_DBG})
# Find wxWidgets multilib libraries.
- FOREACH(LIB core adv aui html media xrc dbgrid gl qa richtext
+ foreach(LIB core adv aui html media xrc dbgrid gl qa richtext
stc ribbon propgrid)
- FIND_LIBRARY(WX_${LIB}${_DBG}
+ find_library(WX_${LIB}${_DBG}
NAMES
wxmsw${_UNV}31${_UCD}${_DBG}_${LIB}
wxmsw${_UNV}30${_UCD}${_DBG}_${LIB}
@@ -337,102 +343,102 @@
PATHS ${WX_LIB_DIR}
NO_DEFAULT_PATH
)
- MARK_AS_ADVANCED(WX_${LIB}${_DBG})
- ENDFOREACH(LIB)
- ENDMACRO(WX_FIND_LIBS)
+ mark_as_advanced(WX_${LIB}${_DBG})
+ endforeach(LIB)
+ endmacro(wx_find_libs)
#
# Clear all library paths, so that FIND_LIBRARY refinds them.
#
# Clear a lib, reset its found flag, and mark as advanced.
- MACRO(WX_CLEAR_LIB _LIB)
- SET(${_LIB} "${_LIB}-NOTFOUND" CACHE FILEPATH "Cleared." FORCE)
- SET(${_LIB}_FOUND FALSE)
- MARK_AS_ADVANCED(${_LIB})
- ENDMACRO(WX_CLEAR_LIB)
+ macro(wx_clear_lib _LIB)
+ set(${_LIB} "${_LIB}-NOTFOUND" CACHE FILEPATH "Cleared." FORCE)
+ set(${_LIB}_FOUND FALSE)
+ mark_as_advanced(${_LIB})
+ endmacro(wx_clear_lib)
# Clear all debug or release library paths (arguments are "d" or "").
- MACRO(WX_CLEAR_ALL_LIBS _DBG)
+ macro(wx_clear_all_libs _DBG)
# Clear wxWidgets common libraries.
- FOREACH(LIB ${wxWidgets_COMMON_LIBRARIES} scintilla)
- WX_CLEAR_LIB(WX_${LIB}${_DBG})
- ENDFOREACH(LIB)
+ foreach(LIB ${wxWidgets_COMMON_LIBRARIES} scintilla)
+ wx_clear_lib(WX_${LIB}${_DBG})
+ endforeach(LIB)
# Clear wxWidgets multilib base libraries.
- WX_CLEAR_LIB(WX_base${_DBG})
- FOREACH(LIB net odbc xml)
- WX_CLEAR_LIB(WX_${LIB}${_DBG})
- ENDFOREACH(LIB)
+ wx_clear_lib(WX_base${_DBG})
+ foreach(LIB net odbc xml)
+ wx_clear_lib(WX_${LIB}${_DBG})
+ endforeach(LIB)
# Clear wxWidgets monolithic library.
- WX_CLEAR_LIB(WX_mono${_DBG})
+ wx_clear_lib(WX_mono${_DBG})
# Clear wxWidgets multilib libraries.
- FOREACH(LIB core adv aui html media xrc dbgrid gl qa richtext
+ foreach(LIB core adv aui html media xrc dbgrid gl qa richtext
stc ribbon propgrid)
- WX_CLEAR_LIB(WX_${LIB}${_DBG})
- ENDFOREACH(LIB)
- ENDMACRO(WX_CLEAR_ALL_LIBS)
+ wx_clear_lib(WX_${LIB}${_DBG})
+ endforeach(LIB)
+ endmacro(wx_clear_all_libs)
# Clear all wxWidgets debug libraries.
- MACRO(WX_CLEAR_ALL_DBG_LIBS)
- WX_CLEAR_ALL_LIBS("d")
- ENDMACRO(WX_CLEAR_ALL_DBG_LIBS)
+ macro(wx_clear_all_dbg_libs)
+ wx_clear_all_libs("d")
+ endmacro(wx_clear_all_dbg_libs)
# Clear all wxWidgets release libraries.
- MACRO(WX_CLEAR_ALL_REL_LIBS)
- WX_CLEAR_ALL_LIBS("")
- ENDMACRO(WX_CLEAR_ALL_REL_LIBS)
+ macro(wx_clear_all_rel_libs)
+ wx_clear_all_libs("")
+ endmacro(wx_clear_all_rel_libs)
#
# Set the wxWidgets_LIBRARIES variable.
# Also, Sets output variable wxWidgets_FOUND to FALSE if it fails.
#
- MACRO(WX_SET_LIBRARIES _LIBS _DBG)
- DBG_MSG_V("Looking for ${${_LIBS}}")
- IF(WX_USE_REL_AND_DBG)
- FOREACH(LIB ${${_LIBS}})
- DBG_MSG_V("Searching for ${LIB} and ${LIB}d")
- DBG_MSG_V("WX_${LIB} : ${WX_${LIB}}")
- DBG_MSG_V("WX_${LIB}d : ${WX_${LIB}d}")
- IF(WX_${LIB} AND WX_${LIB}d)
- DBG_MSG_V("Found ${LIB} and ${LIB}d")
- LIST(APPEND wxWidgets_LIBRARIES
+ macro(wx_set_libraries _LIBS _DBG)
+ dbg_msg_v("Looking for ${${_LIBS}}")
+ if(WX_USE_REL_AND_DBG)
+ foreach(LIB ${${_LIBS}})
+ dbg_msg_v("Searching for ${LIB} and ${LIB}d")
+ dbg_msg_v("WX_${LIB} : ${WX_${LIB}}")
+ dbg_msg_v("WX_${LIB}d : ${WX_${LIB}d}")
+ if(WX_${LIB} AND WX_${LIB}d)
+ dbg_msg_v("Found ${LIB} and ${LIB}d")
+ list(APPEND wxWidgets_LIBRARIES
debug ${WX_${LIB}d} optimized ${WX_${LIB}}
)
- ELSE(WX_${LIB} AND WX_${LIB}d)
- DBG_MSG_V("- not found due to missing WX_${LIB}=${WX_${LIB}} or WX_${LIB}d=${WX_${LIB}d}")
- SET(wxWidgets_FOUND FALSE)
- ENDIF(WX_${LIB} AND WX_${LIB}d)
- ENDFOREACH(LIB)
- ELSE(WX_USE_REL_AND_DBG)
- FOREACH(LIB ${${_LIBS}})
- DBG_MSG_V("Searching for ${LIB}${_DBG}")
- DBG_MSG_V("WX_${LIB}${_DBG} : ${WX_${LIB}${_DBG}}")
- IF(WX_${LIB}${_DBG})
- DBG_MSG_V("Found ${LIB}${_DBG}")
- LIST(APPEND wxWidgets_LIBRARIES ${WX_${LIB}${_DBG}})
- ELSE(WX_${LIB}${_DBG})
- DBG_MSG_V(
+ else(WX_${LIB} AND WX_${LIB}d)
+ dbg_msg_v("- not found due to missing WX_${LIB}=${WX_${LIB}} or WX_${LIB}d=${WX_${LIB}d}")
+ set(wxWidgets_FOUND FALSE)
+ endif(WX_${LIB} AND WX_${LIB}d)
+ endforeach(LIB)
+ else(WX_USE_REL_AND_DBG)
+ foreach(LIB ${${_LIBS}})
+ dbg_msg_v("Searching for ${LIB}${_DBG}")
+ dbg_msg_v("WX_${LIB}${_DBG} : ${WX_${LIB}${_DBG}}")
+ if(WX_${LIB}${_DBG})
+ dbg_msg_v("Found ${LIB}${_DBG}")
+ list(APPEND wxWidgets_LIBRARIES ${WX_${LIB}${_DBG}})
+ else(WX_${LIB}${_DBG})
+ dbg_msg_v(
"- not found due to missing WX_${LIB}${_DBG}=${WX_${LIB}${_DBG}}")
- SET(wxWidgets_FOUND FALSE)
- ENDIF(WX_${LIB}${_DBG})
- ENDFOREACH(LIB)
- ENDIF(WX_USE_REL_AND_DBG)
-
- DBG_MSG_V("OpenGL")
- LIST(FIND ${_LIBS} gl WX_USE_GL)
- IF(NOT WX_USE_GL EQUAL -1)
- DBG_MSG_V("- is required.")
- LIST(APPEND wxWidgets_LIBRARIES opengl32 glu32)
- ENDIF(NOT WX_USE_GL EQUAL -1)
-
- LIST(APPEND wxWidgets_LIBRARIES winmm comctl32 rpcrt4 wsock32)
- ENDMACRO(WX_SET_LIBRARIES)
+ set(wxWidgets_FOUND FALSE)
+ endif(WX_${LIB}${_DBG})
+ endforeach(LIB)
+ endif(WX_USE_REL_AND_DBG)
+
+ dbg_msg_v("OpenGL")
+ list(FIND ${_LIBS} gl WX_USE_GL)
+ if(NOT WX_USE_GL EQUAL -1)
+ dbg_msg_v("- is required.")
+ list(APPEND wxWidgets_LIBRARIES opengl32 glu32)
+ endif(NOT WX_USE_GL EQUAL -1)
+
+ list(APPEND wxWidgets_LIBRARIES winmm comctl32 rpcrt4 wsock32)
+ endmacro(wx_set_libraries)
#-------------------------------------------------------------------
# WIN32: Start actual work.
#-------------------------------------------------------------------
# Look for an installation tree.
- FIND_PATH(wxWidgets_ROOT_DIR
+ find_path(wxWidgets_ROOT_DIR
NAMES include/wx/wx.h
PATHS
$ENV{wxWidgets_ROOT_DIR}
@@ -442,7 +448,7 @@
D:/
$ENV{ProgramFiles}
PATH_SUFFIXES
- wxWidgets-3.1.0
+ wxWidgets-3.0.1
wxWidgets-3.0.0
wxWidgets-2.9.5
wxWidgets-2.9.4
@@ -479,30 +485,30 @@
)
# If wxWidgets_ROOT_DIR changed, clear lib dir.
- IF(NOT WX_ROOT_DIR STREQUAL wxWidgets_ROOT_DIR)
- DBG_MSG( "WX_ROOT_DIR != wxWidgets_ROOT_DIR" )
+ if(NOT WX_ROOT_DIR STREQUAL wxWidgets_ROOT_DIR)
+ dbg_msg( "WX_ROOT_DIR != wxWidgets_ROOT_DIR" )
- SET(WX_ROOT_DIR ${wxWidgets_ROOT_DIR}
+ set(WX_ROOT_DIR ${wxWidgets_ROOT_DIR}
CACHE INTERNAL "wxWidgets_ROOT_DIR")
- SET(wxWidgets_LIB_DIR "wxWidgets_LIB_DIR-NOTFOUND"
+ set(wxWidgets_LIB_DIR "wxWidgets_LIB_DIR-NOTFOUND"
CACHE PATH "Cleared." FORCE)
- ENDIF(NOT WX_ROOT_DIR STREQUAL wxWidgets_ROOT_DIR)
+ endif(NOT WX_ROOT_DIR STREQUAL wxWidgets_ROOT_DIR)
- IF(WX_ROOT_DIR)
- DBG_MSG( "WX_ROOT_DIR == wxWidgets_ROOT_DIR" )
+ if(WX_ROOT_DIR)
+ dbg_msg( "WX_ROOT_DIR == wxWidgets_ROOT_DIR" )
# Select one default tree inside the already determined wx tree.
# Prefer static/shared order usually consistent with build
# settings.
- IF(MINGW)
- DBG_MSG( "MINGW" )
- SET(WX_LIB_DIR_PREFIX gcc)
- ELSE(MINGW)
- SET(WX_LIB_DIR_PREFIX vc)
- ENDIF(MINGW)
- IF(BUILD_SHARED_LIBS)
- DBG_MSG( "BUILD_SHARED_LIBS" )
- FIND_PATH(wxWidgets_LIB_DIR
+ if(MINGW)
+ dbg_msg( "MINGW" )
+ set(WX_LIB_DIR_PREFIX gcc)
+ else(MINGW)
+ set(WX_LIB_DIR_PREFIX vc)
+ endif(MINGW)
+ if(BUILD_SHARED_LIBS)
+ dbg_msg( "BUILD_SHARED_LIBS" )
+ find_path(wxWidgets_LIB_DIR
NAMES
msw/wx/setup.h
mswd/wx/setup.h
@@ -518,9 +524,9 @@
DOC "Path to wxWidgets libraries?"
NO_DEFAULT_PATH
)
- ELSE(BUILD_SHARED_LIBS)
- DBG_MSG( "!BUILD_SHARED_LIBS WX_LIB_DIR:${WX_LIB_DIR}" )
- FIND_PATH(wxWidgets_LIB_DIR
+ else(BUILD_SHARED_LIBS)
+ dbg_msg( "!BUILD_SHARED_LIBS WX_LIB_DIR:${WX_LIB_DIR}" )
+ find_path(wxWidgets_LIB_DIR
NAMES
msw/wx/setup.h
mswd/wx/setup.h
@@ -536,111 +542,111 @@
DOC "Path to wxWidgets libraries?"
NO_DEFAULT_PATH
)
- ENDIF(BUILD_SHARED_LIBS)
+ endif(BUILD_SHARED_LIBS)
# If wxWidgets_LIB_DIR changed, clear all libraries.
- IF(NOT WX_LIB_DIR STREQUAL wxWidgets_LIB_DIR)
- SET(WX_LIB_DIR ${wxWidgets_LIB_DIR} CACHE INTERNAL "wxWidgets_LIB_DIR")
- WX_CLEAR_ALL_DBG_LIBS()
- WX_CLEAR_ALL_REL_LIBS()
- ENDIF(NOT WX_LIB_DIR STREQUAL wxWidgets_LIB_DIR)
+ if(NOT WX_LIB_DIR STREQUAL wxWidgets_LIB_DIR)
+ set(WX_LIB_DIR ${wxWidgets_LIB_DIR} CACHE INTERNAL "wxWidgets_LIB_DIR")
+ wx_clear_all_dbg_libs()
+ wx_clear_all_rel_libs()
+ endif(NOT WX_LIB_DIR STREQUAL wxWidgets_LIB_DIR)
- IF(WX_LIB_DIR)
+ if(WX_LIB_DIR)
# If building shared libs, define WXUSINGDLL to use dllimport.
- IF(WX_LIB_DIR MATCHES ".*[dD][lL][lL].*")
- SET(wxWidgets_DEFINITIONS WXUSINGDLL)
- DBG_MSG_V("detected SHARED/DLL tree WX_LIB_DIR=${WX_LIB_DIR}")
- ENDIF(WX_LIB_DIR MATCHES ".*[dD][lL][lL].*")
+ if(WX_LIB_DIR MATCHES ".*[dD][lL][lL].*")
+ set(wxWidgets_DEFINITIONS WXUSINGDLL)
+ dbg_msg_v("detected SHARED/DLL tree WX_LIB_DIR=${WX_LIB_DIR}")
+ endif(WX_LIB_DIR MATCHES ".*[dD][lL][lL].*")
# Search for available configuration types.
- FOREACH(CFG mswunivud mswunivd mswud mswd mswunivu mswuniv mswu msw)
- SET(WX_${CFG}_FOUND FALSE)
- IF(EXISTS ${WX_LIB_DIR}/${CFG})
- LIST(APPEND WX_CONFIGURATION_LIST ${CFG})
- SET(WX_${CFG}_FOUND TRUE)
- SET(WX_CONFIGURATION ${CFG})
- ENDIF(EXISTS ${WX_LIB_DIR}/${CFG})
- ENDFOREACH(CFG)
- DBG_MSG_V("WX_CONFIGURATION_LIST=${WX_CONFIGURATION_LIST}")
+ foreach(CFG mswunivud mswunivd mswud mswd mswunivu mswuniv mswu msw)
+ set(WX_${CFG}_FOUND FALSE)
+ if(EXISTS ${WX_LIB_DIR}/${CFG})
+ list(APPEND WX_CONFIGURATION_LIST ${CFG})
+ set(WX_${CFG}_FOUND TRUE)
+ set(WX_CONFIGURATION ${CFG})
+ endif(EXISTS ${WX_LIB_DIR}/${CFG})
+ endforeach(CFG)
+ dbg_msg_v("WX_CONFIGURATION_LIST=${WX_CONFIGURATION_LIST}")
- IF(WX_CONFIGURATION)
- SET(wxWidgets_FOUND TRUE)
+ if(WX_CONFIGURATION)
+ set(wxWidgets_FOUND TRUE)
# If the selected configuration wasn't found force the default
# one. Otherwise, use it but still force a refresh for
# updating the doc string with the current list of available
# configurations.
- IF(NOT WX_${wxWidgets_CONFIGURATION}_FOUND)
- SET(wxWidgets_CONFIGURATION ${WX_CONFIGURATION} CACHE STRING
- "Set wxWidgets configuration (${WX_CONFIGURATION_LIST})" FORCE)
- ELSE(NOT WX_${wxWidgets_CONFIGURATION}_FOUND)
- SET(wxWidgets_CONFIGURATION ${wxWidgets_CONFIGURATION} CACHE STRING
- "Set wxWidgets configuration (${WX_CONFIGURATION_LIST})" FORCE)
- ENDIF(NOT WX_${wxWidgets_CONFIGURATION}_FOUND)
+ if(NOT WX_${wxWidgets_CONFIGURATION}_FOUND)
+ set(wxWidgets_CONFIGURATION ${WX_CONFIGURATION} CACHE STRING
+ "Set wxWidgets configuration (${WX_CONFIGURATION_LIST})" FORCE)
+ else(NOT WX_${wxWidgets_CONFIGURATION}_FOUND)
+ set(wxWidgets_CONFIGURATION ${wxWidgets_CONFIGURATION} CACHE STRING
+ "Set wxWidgets configuration (${WX_CONFIGURATION_LIST})" FORCE)
+ endif(NOT WX_${wxWidgets_CONFIGURATION}_FOUND)
# If release config selected, and both release/debug exist.
- IF(WX_${wxWidgets_CONFIGURATION}d_FOUND)
+ if(WX_${wxWidgets_CONFIGURATION}d_FOUND)
OPTION(wxWidgets_USE_REL_AND_DBG
"Use release and debug configurations?" TRUE)
- SET(WX_USE_REL_AND_DBG ${wxWidgets_USE_REL_AND_DBG})
- ELSE(WX_${wxWidgets_CONFIGURATION}d_FOUND)
+ set(WX_USE_REL_AND_DBG ${wxWidgets_USE_REL_AND_DBG})
+ else(WX_${wxWidgets_CONFIGURATION}d_FOUND)
# If the option exists (already in cache), force it false.
- IF(wxWidgets_USE_REL_AND_DBG)
- SET(wxWidgets_USE_REL_AND_DBG FALSE CACHE BOOL
+ if(wxWidgets_USE_REL_AND_DBG)
+ set(wxWidgets_USE_REL_AND_DBG FALSE CACHE BOOL
"No ${wxWidgets_CONFIGURATION}d found." FORCE)
- ENDIF(wxWidgets_USE_REL_AND_DBG)
- SET(WX_USE_REL_AND_DBG FALSE)
- ENDIF(WX_${wxWidgets_CONFIGURATION}d_FOUND)
+ endif(wxWidgets_USE_REL_AND_DBG)
+ set(WX_USE_REL_AND_DBG FALSE)
+ endif(WX_${wxWidgets_CONFIGURATION}d_FOUND)
# Get configuration parameters from the name.
- WX_GET_NAME_COMPONENTS(${wxWidgets_CONFIGURATION} UNV UCD DBG)
+ wx_get_name_components(${wxWidgets_CONFIGURATION} UNV UCD DBG)
# Set wxWidgets lib setup include directory.
- IF(EXISTS ${WX_LIB_DIR}/${wxWidgets_CONFIGURATION}/wx/setup.h)
- SET(wxWidgets_INCLUDE_DIRS
+ if(EXISTS ${WX_LIB_DIR}/${wxWidgets_CONFIGURATION}/wx/setup.h)
+ set(wxWidgets_INCLUDE_DIRS
${WX_LIB_DIR}/${wxWidgets_CONFIGURATION})
- ELSE(EXISTS ${WX_LIB_DIR}/${wxWidgets_CONFIGURATION}/wx/setup.h)
- DBG_MSG("wxWidgets_FOUND FALSE because ${WX_LIB_DIR}/${wxWidgets_CONFIGURATION}/wx/setup.h does not exists.")
- SET(wxWidgets_FOUND FALSE)
- ENDIF(EXISTS ${WX_LIB_DIR}/${wxWidgets_CONFIGURATION}/wx/setup.h)
+ else(EXISTS ${WX_LIB_DIR}/${wxWidgets_CONFIGURATION}/wx/setup.h)
+ dbg_msg("wxWidgets_FOUND FALSE because ${WX_LIB_DIR}/${wxWidgets_CONFIGURATION}/wx/setup.h does not exists.")
+ set(wxWidgets_FOUND FALSE)
+ endif(EXISTS ${WX_LIB_DIR}/${wxWidgets_CONFIGURATION}/wx/setup.h)
# Set wxWidgets main include directory.
- IF(EXISTS ${WX_ROOT_DIR}/include/wx/wx.h)
- LIST(APPEND wxWidgets_INCLUDE_DIRS ${WX_ROOT_DIR}/include)
- ELSE(EXISTS ${WX_ROOT_DIR}/include/wx/wx.h)
- DBG_MSG("wxWidgets_FOUND FALSE because WX_ROOT_DIR=${WX_ROOT_DIR} has no ${WX_ROOT_DIR}/include/wx/wx.h")
- SET(wxWidgets_FOUND FALSE)
- ENDIF(EXISTS ${WX_ROOT_DIR}/include/wx/wx.h)
+ if(EXISTS ${WX_ROOT_DIR}/include/wx/wx.h)
+ list(APPEND wxWidgets_INCLUDE_DIRS ${WX_ROOT_DIR}/include)
+ else(EXISTS ${WX_ROOT_DIR}/include/wx/wx.h)
+ dbg_msg("wxWidgets_FOUND FALSE because WX_ROOT_DIR=${WX_ROOT_DIR} has no ${WX_ROOT_DIR}/include/wx/wx.h")
+ set(wxWidgets_FOUND FALSE)
+ endif(EXISTS ${WX_ROOT_DIR}/include/wx/wx.h)
# Find wxWidgets libraries.
- WX_FIND_LIBS("${UNV}" "${UCD}" "${DBG}")
- IF(WX_USE_REL_AND_DBG)
- WX_FIND_LIBS("${UNV}" "${UCD}" "d")
- ENDIF(WX_USE_REL_AND_DBG)
+ wx_find_libs("${UNV}" "${UCD}" "${DBG}")
+ if(WX_USE_REL_AND_DBG)
+ wx_find_libs("${UNV}" "${UCD}" "d")
+ endif(WX_USE_REL_AND_DBG)
# Settings for requested libs (i.e., include dir, libraries, etc.).
- WX_SET_LIBRARIES(wxWidgets_FIND_COMPONENTS "${DBG}")
+ wx_set_libraries(wxWidgets_FIND_COMPONENTS "${DBG}")
# Add necessary definitions for unicode builds
- IF("${UCD}" STREQUAL "u")
- LIST(APPEND wxWidgets_DEFINITIONS UNICODE _UNICODE)
- ENDIF("${UCD}" STREQUAL "u")
+ if("${UCD}" STREQUAL "u")
+ list(APPEND wxWidgets_DEFINITIONS UNICODE _UNICODE)
+ endif("${UCD}" STREQUAL "u")
# Add necessary definitions for debug builds
- SET(wxWidgets_DEFINITIONS_DEBUG _DEBUG __WXDEBUG__)
+ set(wxWidgets_DEFINITIONS_DEBUG _DEBUG __WXDEBUG__)
- ENDIF(WX_CONFIGURATION)
- ENDIF(WX_LIB_DIR)
- ENDIF(WX_ROOT_DIR)
+ endif(WX_CONFIGURATION)
+ endif(WX_LIB_DIR)
+ endif(WX_ROOT_DIR)
#=====================================================================
# UNIX_FIND_STYLE
#=====================================================================
-ELSE(wxWidgets_FIND_STYLE STREQUAL "win32")
- DBG_MSG("NOT win32 path")
+else(wxWidgets_FIND_STYLE STREQUAL "win32")
+ dbg_msg("NOT win32 path")
- IF(wxWidgets_FIND_STYLE STREQUAL "unix")
- DBG_MSG("unix find style")
+ if(wxWidgets_FIND_STYLE STREQUAL "unix")
+ dbg_msg("unix find style")
#-----------------------------------------------------------------
# UNIX: Helper MACROS
@@ -648,221 +654,255 @@
#
# Set the default values based on "wx-config --selected-config".
#
- MACRO(WX_CONFIG_SELECT_GET_DEFAULT)
- EXECUTE_PROCESS(
+ macro(wx_config_select_get_default)
+ execute_process(
COMMAND sh "${wxWidgets_CONFIG_EXECUTABLE}"
${wxWidgets_CONFIG_OPTIONS} --selected-config
OUTPUT_VARIABLE _wx_selected_config
RESULT_VARIABLE _wx_result
ERROR_QUIET
)
- IF(_wx_result EQUAL 0)
- FOREACH(_opt_name debug static unicode universal)
- STRING(TOUPPER ${_opt_name} _upper_opt_name)
- IF(_wx_selected_config MATCHES ".*${_opt_name}.*")
- SET(wxWidgets_DEFAULT_${_upper_opt_name} ON)
- ELSE(_wx_selected_config MATCHES ".*${_opt_name}.*")
- SET(wxWidgets_DEFAULT_${_upper_opt_name} OFF)
- ENDIF(_wx_selected_config MATCHES ".*${_opt_name}.*")
- ENDFOREACH(_opt_name)
- ELSE(_wx_result EQUAL 0)
- FOREACH(_upper_opt_name DEBUG STATIC UNICODE UNIVERSAL)
- SET(wxWidgets_DEFAULT_${_upper_opt_name} OFF)
- ENDFOREACH(_upper_opt_name)
- ENDIF(_wx_result EQUAL 0)
- ENDMACRO(WX_CONFIG_SELECT_GET_DEFAULT)
+ if(_wx_result EQUAL 0)
+ foreach(_opt_name debug static unicode universal)
+ string(TOUPPER ${_opt_name} _upper_opt_name)
+ if(_wx_selected_config MATCHES ".*${_opt_name}.*")
+ set(wxWidgets_DEFAULT_${_upper_opt_name} ON)
+ else(_wx_selected_config MATCHES ".*${_opt_name}.*")
+ set(wxWidgets_DEFAULT_${_upper_opt_name} OFF)
+ endif(_wx_selected_config MATCHES ".*${_opt_name}.*")
+ endforeach(_opt_name)
+ else(_wx_result EQUAL 0)
+ foreach(_upper_opt_name DEBUG STATIC UNICODE UNIVERSAL)
+ set(wxWidgets_DEFAULT_${_upper_opt_name} OFF)
+ endforeach(_upper_opt_name)
+ endif(_wx_result EQUAL 0)
+ endmacro(wx_config_select_get_default)
#
# Query a boolean configuration option to determine if the system
# has both builds available. If so, provide the selection option
# to the user.
#
- MACRO(WX_CONFIG_SELECT_QUERY_BOOL _OPT_NAME _OPT_HELP)
- EXECUTE_PROCESS(
+ macro(wx_config_select_query_bool _OPT_NAME _OPT_HELP)
+ execute_process(
COMMAND sh "${wxWidgets_CONFIG_EXECUTABLE}"
${wxWidgets_CONFIG_OPTIONS} --${_OPT_NAME}=yes
RESULT_VARIABLE _wx_result_yes
OUTPUT_QUIET
ERROR_QUIET
)
- EXECUTE_PROCESS(
+ execute_process(
COMMAND sh "${wxWidgets_CONFIG_EXECUTABLE}"
${wxWidgets_CONFIG_OPTIONS} --${_OPT_NAME}=no
RESULT_VARIABLE _wx_result_no
OUTPUT_QUIET
ERROR_QUIET
)
- STRING(TOUPPER ${_OPT_NAME} _UPPER_OPT_NAME)
- IF(_wx_result_yes EQUAL 0 AND _wx_result_no EQUAL 0)
+ string(TOUPPER ${_OPT_NAME} _UPPER_OPT_NAME)
+ if(_wx_result_yes EQUAL 0 AND _wx_result_no EQUAL 0)
OPTION(wxWidgets_USE_${_UPPER_OPT_NAME}
${_OPT_HELP} ${wxWidgets_DEFAULT_${_UPPER_OPT_NAME}})
- ELSE(_wx_result_yes EQUAL 0 AND _wx_result_no EQUAL 0)
+ else(_wx_result_yes EQUAL 0 AND _wx_result_no EQUAL 0)
# If option exists (already in cache), force to available one.
- IF(DEFINED wxWidgets_USE_${_UPPER_OPT_NAME})
- IF(_wx_result_yes EQUAL 0)
- SET(wxWidgets_USE_${_UPPER_OPT_NAME} ON CACHE BOOL ${_OPT_HELP} FORCE)
- ELSE(_wx_result_yes EQUAL 0)
- SET(wxWidgets_USE_${_UPPER_OPT_NAME} OFF CACHE BOOL ${_OPT_HELP} FORCE)
- ENDIF(_wx_result_yes EQUAL 0)
- ENDIF(DEFINED wxWidgets_USE_${_UPPER_OPT_NAME})
- ENDIF(_wx_result_yes EQUAL 0 AND _wx_result_no EQUAL 0)
- ENDMACRO(WX_CONFIG_SELECT_QUERY_BOOL)
+ if(DEFINED wxWidgets_USE_${_UPPER_OPT_NAME})
+ if(_wx_result_yes EQUAL 0)
+ set(wxWidgets_USE_${_UPPER_OPT_NAME} ON CACHE BOOL ${_OPT_HELP} FORCE)
+ else(_wx_result_yes EQUAL 0)
+ set(wxWidgets_USE_${_UPPER_OPT_NAME} OFF CACHE BOOL ${_OPT_HELP} FORCE)
+ endif(_wx_result_yes EQUAL 0)
+ endif(DEFINED wxWidgets_USE_${_UPPER_OPT_NAME})
+ endif(_wx_result_yes EQUAL 0 AND _wx_result_no EQUAL 0)
+ endmacro(wx_config_select_query_bool)
#
# Set wxWidgets_SELECT_OPTIONS to wx-config options for selecting
# among multiple builds.
#
- MACRO(WX_CONFIG_SELECT_SET_OPTIONS)
- SET(wxWidgets_SELECT_OPTIONS ${wxWidgets_CONFIG_OPTIONS})
- FOREACH(_opt_name debug static unicode universal)
- STRING(TOUPPER ${_opt_name} _upper_opt_name)
- IF(DEFINED wxWidgets_USE_${_upper_opt_name})
- IF(wxWidgets_USE_${_upper_opt_name})
- LIST(APPEND wxWidgets_SELECT_OPTIONS --${_opt_name}=yes)
- ELSE(wxWidgets_USE_${_upper_opt_name})
- LIST(APPEND wxWidgets_SELECT_OPTIONS --${_opt_name}=no)
- ENDIF(wxWidgets_USE_${_upper_opt_name})
- ENDIF(DEFINED wxWidgets_USE_${_upper_opt_name})
- ENDFOREACH(_opt_name)
- ENDMACRO(WX_CONFIG_SELECT_SET_OPTIONS)
+ macro(wx_config_select_set_options)
+ set(wxWidgets_SELECT_OPTIONS ${wxWidgets_CONFIG_OPTIONS})
+ foreach(_opt_name debug static unicode universal)
+ string(TOUPPER ${_opt_name} _upper_opt_name)
+ if(DEFINED wxWidgets_USE_${_upper_opt_name})
+ if(wxWidgets_USE_${_upper_opt_name})
+ list(APPEND wxWidgets_SELECT_OPTIONS --${_opt_name}=yes)
+ else(wxWidgets_USE_${_upper_opt_name})
+ list(APPEND wxWidgets_SELECT_OPTIONS --${_opt_name}=no)
+ endif(wxWidgets_USE_${_upper_opt_name})
+ endif(DEFINED wxWidgets_USE_${_upper_opt_name})
+ endforeach(_opt_name)
+ endmacro(wx_config_select_set_options)
#-----------------------------------------------------------------
# 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 wx-config
ONLY_CMAKE_FIND_ROOT_PATH
)
- IF(wxWidgets_CONFIG_EXECUTABLE)
- SET(wxWidgets_FOUND TRUE)
+ if(wxWidgets_CONFIG_EXECUTABLE)
+ set(wxWidgets_FOUND TRUE)
# get defaults based on "wx-config --selected-config"
- WX_CONFIG_SELECT_GET_DEFAULT()
+ wx_config_select_get_default()
# for each option: if both builds are available, provide option
- WX_CONFIG_SELECT_QUERY_BOOL(debug "Use debug build?")
- WX_CONFIG_SELECT_QUERY_BOOL(unicode "Use unicode build?")
- WX_CONFIG_SELECT_QUERY_BOOL(universal "Use universal build?")
- WX_CONFIG_SELECT_QUERY_BOOL(static "Link libraries statically?")
+ wx_config_select_query_bool(debug "Use debug build?")
+ wx_config_select_query_bool(unicode "Use unicode build?")
+ wx_config_select_query_bool(universal "Use universal build?")
+ wx_config_select_query_bool(static "Link libraries statically?")
# process selection to set wxWidgets_SELECT_OPTIONS
- WX_CONFIG_SELECT_SET_OPTIONS()
- DBG_MSG("wxWidgets_SELECT_OPTIONS=${wxWidgets_SELECT_OPTIONS}")
+ wx_config_select_set_options()
+ dbg_msg("wxWidgets_SELECT_OPTIONS=${wxWidgets_SELECT_OPTIONS}")
# run the wx-config program to get cxxflags
- EXECUTE_PROCESS(
+ execute_process(
COMMAND sh "${wxWidgets_CONFIG_EXECUTABLE}"
${wxWidgets_SELECT_OPTIONS} --cxxflags
OUTPUT_VARIABLE wxWidgets_CXX_FLAGS
RESULT_VARIABLE RET
ERROR_QUIET
)
- IF(RET EQUAL 0)
- STRING(STRIP "${wxWidgets_CXX_FLAGS}" wxWidgets_CXX_FLAGS)
- SEPARATE_ARGUMENTS(wxWidgets_CXX_FLAGS)
+ if(RET EQUAL 0)
+ string(STRIP "${wxWidgets_CXX_FLAGS}" wxWidgets_CXX_FLAGS)
+ separate_arguments(wxWidgets_CXX_FLAGS)
- DBG_MSG_V("wxWidgets_CXX_FLAGS=${wxWidgets_CXX_FLAGS}")
+ dbg_msg_v("wxWidgets_CXX_FLAGS=${wxWidgets_CXX_FLAGS}")
# parse definitions from cxxflags;
# drop -D* from CXXFLAGS and the -D prefix
- STRING(REGEX MATCHALL "-D[^;]+"
+ string(REGEX MATCHALL "-D[^;]+"
wxWidgets_DEFINITIONS "${wxWidgets_CXX_FLAGS}")
- STRING(REGEX REPLACE "-D[^;]+(;|$)" ""
- wxWidgets_CXX_FLAGS "${wxWidgets_CXX_FLAGS}")
- STRING(REGEX REPLACE ";$" ""
- wxWidgets_CXX_FLAGS "${wxWidgets_CXX_FLAGS}")
- STRING(REPLACE "-D" ""
+ string(REGEX REPLACE "-D[^;]+(;|$)" ""
+ wxWidgets_CXX_FLAGS "${wxWidgets_CXX_FLAGS}")
+ string(REGEX REPLACE ";$" ""
+ wxWidgets_CXX_FLAGS "${wxWidgets_CXX_FLAGS}")
+ string(REPLACE "-D" ""
wxWidgets_DEFINITIONS "${wxWidgets_DEFINITIONS}")
# parse include dirs from cxxflags; drop -I prefix
- STRING(REGEX MATCHALL "-I[^;]+"
+ string(REGEX MATCHALL "-I[^;]+"
wxWidgets_INCLUDE_DIRS "${wxWidgets_CXX_FLAGS}")
- STRING(REGEX REPLACE "-I[^;]+;" ""
+ string(REGEX REPLACE "-I[^;]+;" ""
wxWidgets_CXX_FLAGS "${wxWidgets_CXX_FLAGS}")
- STRING(REPLACE "-I" ""
+ string(REPLACE "-I" ""
wxWidgets_INCLUDE_DIRS "${wxWidgets_INCLUDE_DIRS}")
# Flags are a string, not a list, fix it here
string(REPLACE ";" " "
wxWidgets_CXX_FLAGS "${wxWidgets_CXX_FLAGS}")
- DBG_MSG_V("wxWidgets_DEFINITIONS=${wxWidgets_DEFINITIONS}")
- DBG_MSG_V("wxWidgets_INCLUDE_DIRS=${wxWidgets_INCLUDE_DIRS}")
- DBG_MSG_V("wxWidgets_CXX_FLAGS=${wxWidgets_CXX_FLAGS}")
+ dbg_msg_v("wxWidgets_DEFINITIONS=${wxWidgets_DEFINITIONS}")
+ dbg_msg_v("wxWidgets_INCLUDE_DIRS=${wxWidgets_INCLUDE_DIRS}")
+ dbg_msg_v("wxWidgets_CXX_FLAGS=${wxWidgets_CXX_FLAGS}")
- ELSE(RET EQUAL 0)
- SET(wxWidgets_FOUND FALSE)
- DBG_MSG_V(
- "${wxWidgets_CONFIG_EXECUTABLE} --cxxflags FAILED with RET=${RET}")
- ENDIF(RET EQUAL 0)
+ else(RET EQUAL 0)
+ set(wxWidgets_FOUND FALSE)
+ dbg_msg_v("${wxWidgets_CONFIG_EXECUTABLE} --cxxflags FAILED with RET=${RET}")
+ endif(RET EQUAL 0)
# run the wx-config program to get the libs
# - NOTE: wx-config doesn't verify that the libs requested exist
# it just produces the names. Maybe a TRY_COMPILE would
# be useful here...
- STRING(REPLACE ";" ","
+ string(REPLACE ";" ","
wxWidgets_FIND_COMPONENTS "${wxWidgets_FIND_COMPONENTS}")
- EXECUTE_PROCESS(
+ execute_process(
COMMAND sh "${wxWidgets_CONFIG_EXECUTABLE}"
${wxWidgets_SELECT_OPTIONS} --libs ${wxWidgets_FIND_COMPONENTS}
OUTPUT_VARIABLE wxWidgets_LIBRARIES
RESULT_VARIABLE RET
ERROR_QUIET
)
- IF(RET EQUAL 0)
- STRING(STRIP "${wxWidgets_LIBRARIES}" wxWidgets_LIBRARIES)
- SEPARATE_ARGUMENTS(wxWidgets_LIBRARIES)
- STRING(REPLACE "-framework;" "-framework "
- wxWidgets_LIBRARIES "${wxWidgets_LIBRARIES}")
- STRING(REPLACE "-arch;" "-arch "
- wxWidgets_LIBRARIES "${wxWidgets_LIBRARIES}")
- STRING(REPLACE "-isysroot;" "-isysroot "
+ if(RET EQUAL 0)
+ string(STRIP "${wxWidgets_LIBRARIES}" wxWidgets_LIBRARIES)
+ separate_arguments(wxWidgets_LIBRARIES)
+ string(REPLACE "-framework;" "-framework "
+ wxWidgets_LIBRARIES "${wxWidgets_LIBRARIES}")
+ string(REPLACE "-arch;" "-arch "
+ wxWidgets_LIBRARIES "${wxWidgets_LIBRARIES}")
+ string(REPLACE "-isysroot;" "-isysroot "
wxWidgets_LIBRARIES "${wxWidgets_LIBRARIES}")
# extract linkdirs (-L) for rpath (i.e., LINK_DIRECTORIES)
- STRING(REGEX MATCHALL "-L[^;]+"
+ string(REGEX MATCHALL "-L[^;]+"
wxWidgets_LIBRARY_DIRS "${wxWidgets_LIBRARIES}")
- STRING(REPLACE "-L" ""
+ string(REPLACE "-L" ""
wxWidgets_LIBRARY_DIRS "${wxWidgets_LIBRARY_DIRS}")
- DBG_MSG_V("wxWidgets_LIBRARIES=${wxWidgets_LIBRARIES}")
- DBG_MSG_V("wxWidgets_LIBRARY_DIRS=${wxWidgets_LIBRARY_DIRS}")
+ dbg_msg_v("wxWidgets_LIBRARIES=${wxWidgets_LIBRARIES}")
+ dbg_msg_v("wxWidgets_LIBRARY_DIRS=${wxWidgets_LIBRARY_DIRS}")
- ELSE(RET EQUAL 0)
- SET(wxWidgets_FOUND FALSE)
- DBG_MSG("${wxWidgets_CONFIG_EXECUTABLE} --libs ${wxWidgets_FIND_COMPONENTS} FAILED with RET=${RET}")
- ENDIF(RET EQUAL 0)
- ENDIF(wxWidgets_CONFIG_EXECUTABLE)
+ else(RET EQUAL 0)
+ set(wxWidgets_FOUND FALSE)
+ dbg_msg("${wxWidgets_CONFIG_EXECUTABLE} --libs ${wxWidgets_FIND_COMPONENTS} FAILED with RET=${RET}")
+ endif(RET EQUAL 0)
+ endif(wxWidgets_CONFIG_EXECUTABLE)
#=====================================================================
# Neither UNIX_FIND_STYLE, nor WIN32_FIND_STYLE
#=====================================================================
- ELSE(wxWidgets_FIND_STYLE STREQUAL "unix")
- IF(NOT wxWidgets_FIND_QUIETLY)
- MESSAGE(STATUS
+ else(wxWidgets_FIND_STYLE STREQUAL "unix")
+ if(NOT wxWidgets_FIND_QUIETLY)
+ message(STATUS
"${CMAKE_CURRENT_LIST_FILE}(${CMAKE_CURRENT_LIST_LINE}): \n"
" Platform unknown/unsupported. It's neither WIN32 nor UNIX "
"find style."
)
- ENDIF(NOT wxWidgets_FIND_QUIETLY)
- ENDIF(wxWidgets_FIND_STYLE STREQUAL "unix")
-ENDIF(wxWidgets_FIND_STYLE STREQUAL "win32")
+ endif(NOT wxWidgets_FIND_QUIETLY)
+ endif(wxWidgets_FIND_STYLE STREQUAL "unix")
+endif(wxWidgets_FIND_STYLE STREQUAL "win32")
+
+
+# Check if a specfic version was requested by find_package().
+if(wxWidgets_FOUND AND wxWidgets_FIND_VERSION)
+ find_file(_filename wx/version.h PATHS ${wxWidgets_INCLUDE_DIRS})
+ 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}")
-DBG_MSG("wxWidgets_LIBRARY_DIRS : ${wxWidgets_LIBRARY_DIRS}")
-DBG_MSG("wxWidgets_LIBRARIES : ${wxWidgets_LIBRARIES}")
-DBG_MSG("wxWidgets_CXX_FLAGS : ${wxWidgets_CXX_FLAGS}")
-DBG_MSG("wxWidgets_USE_FILE : ${wxWidgets_USE_FILE}")
+dbg_msg("wxWidgets_FOUND : ${wxWidgets_FOUND}")
+dbg_msg("wxWidgets_INCLUDE_DIRS : ${wxWidgets_INCLUDE_DIRS}")
+dbg_msg("wxWidgets_LIBRARY_DIRS : ${wxWidgets_LIBRARY_DIRS}")
+dbg_msg("wxWidgets_LIBRARIES : ${wxWidgets_LIBRARIES}")
+dbg_msg("wxWidgets_CXX_FLAGS : ${wxWidgets_CXX_FLAGS}")
+dbg_msg("wxWidgets_USE_FILE : ${wxWidgets_USE_FILE}")
+dbg_msg("wxWidgets_FIND_VERSION : ${wxWidgets_FIND_VERSION}")
+dbg_msg("wxWidgets_VERSION_MAJOR : ${wxWidgets_VERSION_MAJOR}")
+dbg_msg("wxWidgets_VERSION_MINOR : ${wxWidgets_VERSION_MINOR}")
+dbg_msg("wxWidgets_VERSION_PATCH : ${wxWidgets_VERSION_PATCH}")
#=====================================================================
#=====================================================================
-INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(wxWidgets DEFAULT_MSG wxWidgets_FOUND)
# Maintain consistency with all other variables.
-SET(wxWidgets_FOUND ${WXWIDGETS_FOUND})
+dbg_msg("wxWidgets_FOUND : ${wxWidgets_FOUND}")
+set(WXWIDGETS_FOUND ${wxWidgetsS_FOUND})
+
+include(FindPackageHandleStandardArgs)
+
+find_package_handle_standard_args(wxWidgets
+ FOUND_VAR wxWidgets_FOUND
+ REQUIRED_VARS wxWidgets_LIBRARIES
+ VERSION_VAR wxWidgets_VERSION_STRING
+ )
#=====================================================================
# Macros for use in wxWidgets apps.
@@ -873,23 +913,23 @@
#=====================================================================
# Resource file compiler.
-FIND_PROGRAM(wxWidgets_wxrc_EXECUTABLE wxrc
+find_program(wxWidgets_wxrc_EXECUTABLE wxrc
${wxWidgets_ROOT_DIR}/utils/wxrc/vc_msw
)
#
-# WX_SPLIT_ARGUMENTS_ON(<keyword> <left> <right> <arg1> <arg2> ...)
+# wx_split_arguments_on(<keyword> <left> <right> <arg1> <arg2> ...)
#
# Sets <left> and <right> to contain arguments to the left and right,
# respectively, of <keyword>.
#
# Example usage:
-# FUNCTION(WXWIDGETS_ADD_RESOURCES outfiles)
-# WX_SPLIT_ARGUMENTS_ON(OPTIONS wxrc_files wxrc_options ${ARGN})
+# function(wxwidgets_add_resources outfiles)
+# wx_split_arguments_on(OPTIONS wxrc_files wxrc_options ${ARGN})
# ...
-# ENDFUNCTION(WXWIDGETS_ADD_RESOURCES)
+# endfunction(wxwidgets_add_resources)
#
-# WXWIDGETS_ADD_RESOURCES(sources ${xrc_files} OPTIONS -e -o file.C)
+# wxwidgets_add_resources(sources ${xrc_files} OPTIONS -e -o file.C)
#
# NOTE: This is a generic piece of code that should be renamed to
# SPLIT_ARGUMENTS_ON and put in a file serving the same purpose as
@@ -898,32 +938,32 @@
# here a bit more generalized. So, there are already two find modules
# using this approach.
#
-FUNCTION(WX_SPLIT_ARGUMENTS_ON _keyword _leftvar _rightvar)
+function(wx_split_arguments_on _keyword _leftvar _rightvar)
# FIXME: Document that the input variables will be cleared.
- #LIST(APPEND ${_leftvar} "")
- #LIST(APPEND ${_rightvar} "")
- SET(${_leftvar} "")
- SET(${_rightvar} "")
-
- SET(_doing_right FALSE)
- FOREACH(element ${ARGN})
- IF("${element}" STREQUAL "${_keyword}")
- SET(_doing_right TRUE)
- ELSE("${element}" STREQUAL "${_keyword}")
- IF(_doing_right)
- LIST(APPEND ${_rightvar} "${element}")
- ELSE(_doing_right)
- LIST(APPEND ${_leftvar} "${element}")
- ENDIF(_doing_right)
- ENDIF("${element}" STREQUAL "${_keyword}")
- ENDFOREACH(element)
-
- SET(${_leftvar} ${${_leftvar}} PARENT_SCOPE)
- SET(${_rightvar} ${${_rightvar}} PARENT_SCOPE)
-ENDFUNCTION(WX_SPLIT_ARGUMENTS_ON)
+ #list(APPEND ${_leftvar} "")
+ #list(APPEND ${_rightvar} "")
+ set(${_leftvar} "")
+ set(${_rightvar} "")
+
+ set(_doing_right FALSE)
+ foreach(element ${ARGN})
+ if("${element}" STREQUAL "${_keyword}")
+ set(_doing_right TRUE)
+ else("${element}" STREQUAL "${_keyword}")
+ if(_doing_right)
+ list(APPEND ${_rightvar} "${element}")
+ else(_doing_right)
+ list(APPEND ${_leftvar} "${element}")
+ endif(_doing_right)
+ endif("${element}" STREQUAL "${_keyword}")
+ endforeach(element)
+
+ set(${_leftvar} ${${_leftvar}} PARENT_SCOPE)
+ set(${_rightvar} ${${_rightvar}} PARENT_SCOPE)
+endfunction(wx_split_arguments_on)
#
-# WX_GET_DEPENDENCIES_FROM_XML(
+# wx_get_dependencies_from_xml(
# <depends>
# <match_pattern>
# <clean_pattern>
@@ -933,7 +973,7 @@
#
# FIXME: Add documentation here...
#
-FUNCTION(WX_GET_DEPENDENCIES_FROM_XML
+function(wx_get_dependencies_from_xml
_depends
_match_patt
_clean_patt
@@ -941,55 +981,55 @@
_depends_path
)
- STRING(REGEX MATCHALL
+ string(REGEX MATCHALL
${_match_patt}
dep_file_list
"${${_xml_contents}}"
)
- FOREACH(dep_file ${dep_file_list})
- STRING(REGEX REPLACE ${_clean_patt} "" dep_file "${dep_file}")
+ foreach(dep_file ${dep_file_list})
+ string(REGEX REPLACE ${_clean_patt} "" dep_file "${dep_file}")
# make the file have an absolute path
- IF(NOT IS_ABSOLUTE "${dep_file}")
- SET(dep_file "${${_depends_path}}/${dep_file}")
- ENDIF(NOT IS_ABSOLUTE "${dep_file}")
+ if(NOT IS_ABSOLUTE "${dep_file}")
+ set(dep_file "${${_depends_path}}/${dep_file}")
+ endif(NOT IS_ABSOLUTE "${dep_file}")
# append file to dependency list
- LIST(APPEND ${_depends} "${dep_file}")
- ENDFOREACH(dep_file)
+ list(APPEND ${_depends} "${dep_file}")
+ endforeach(dep_file)
- SET(${_depends} ${${_depends}} PARENT_SCOPE)
-ENDFUNCTION(WX_GET_DEPENDENCIES_FROM_XML)
+ set(${_depends} ${${_depends}} PARENT_SCOPE)
+endfunction(wx_get_dependencies_from_xml)
#
-# WXWIDGETS_ADD_RESOURCES(<sources> <xrc_files>
+# wxwidgets_add_resources(<sources> <xrc_files>
# OPTIONS <options> [NO_CPP_CODE])
#
# Adds a custom command for resource file compilation of the
# <xrc_files> and appends the output files to <sources>.
#
# Example usages:
-# WXWIDGETS_ADD_RESOURCES(sources xrc/main_frame.xrc)
-# WXWIDGETS_ADD_RESOURCES(sources ${xrc_files} OPTIONS -e -o altname.cxx)
+# wxwidgets_add_resources(sources xrc/main_frame.xrc)
+# wxwidgets_add_resources(sources ${xrc_files} OPTIONS -e -o altname.cxx)
#
-FUNCTION(WXWIDGETS_ADD_RESOURCES _outfiles)
- WX_SPLIT_ARGUMENTS_ON(OPTIONS rc_file_list rc_options ${ARGN})
+function(wxwidgets_add_resources _outfiles)
+ wx_split_arguments_on(OPTIONS rc_file_list rc_options ${ARGN})
# Parse files for dependencies.
- SET(rc_file_list_abs "")
- SET(rc_depends "")
- FOREACH(rc_file ${rc_file_list})
- GET_FILENAME_COMPONENT(depends_path ${rc_file} PATH)
+ set(rc_file_list_abs "")
+ set(rc_depends "")
+ foreach(rc_file ${rc_file_list})
+ get_filename_component(depends_path ${rc_file} PATH)
- GET_FILENAME_COMPONENT(rc_file_abs ${rc_file} ABSOLUTE)
- LIST(APPEND rc_file_list_abs "${rc_file_abs}")
+ get_filename_component(rc_file_abs ${rc_file} ABSOLUTE)
+ list(APPEND rc_file_list_abs "${rc_file_abs}")
# All files have absolute paths or paths relative to the location
# of the rc file.
- FILE(READ "${rc_file_abs}" rc_file_contents)
+ file(READ "${rc_file_abs}" rc_file_contents)
# get bitmap/bitmap2 files
- WX_GET_DEPENDENCIES_FROM_XML(
+ wx_get_dependencies_from_xml(
rc_depends
"<bitmap[^<]+"
"^<bitmap[^>]*>"
@@ -998,7 +1038,7 @@
)
# get url files
- WX_GET_DEPENDENCIES_FROM_XML(
+ wx_get_dependencies_from_xml(
rc_depends
"<url[^<]+"
"^<url[^>]*>"
@@ -1007,70 +1047,70 @@
)
# get wxIcon files
- WX_GET_DEPENDENCIES_FROM_XML(
+ wx_get_dependencies_from_xml(
rc_depends
"<object[^>]*class=\"wxIcon\"[^<]+"
"^<object[^>]*>"
rc_file_contents
depends_path
)
- ENDFOREACH(rc_file)
+ endforeach(rc_file)
#
# Parse options.
#
# If NO_CPP_CODE option specified, then produce .xrs file rather
# than a .cpp file (i.e., don't add the default --cpp-code option).
- LIST(FIND rc_options NO_CPP_CODE index)
- IF(index EQUAL -1)
- LIST(APPEND rc_options --cpp-code)
+ list(FIND rc_options NO_CPP_CODE index)
+ if(index EQUAL -1)
+ list(APPEND rc_options --cpp-code)
# wxrc's default output filename for cpp code.
- SET(outfile resource.cpp)
- ELSE(index EQUAL -1)
- LIST(REMOVE_AT rc_options ${index})
+ set(outfile resource.cpp)
+ else(index EQUAL -1)
+ list(REMOVE_AT rc_options ${index})
# wxrc's default output filename for xrs file.
- SET(outfile resource.xrs)
- ENDIF(index EQUAL -1)
+ set(outfile resource.xrs)
+ endif(index EQUAL -1)
- # Get output name for use in ADD_CUSTOM_COMMAND.
+ # Get output name for use in add_custom_command.
# - short option scanning
- LIST(FIND rc_options -o index)
- IF(NOT index EQUAL -1)
+ list(FIND rc_options -o index)
+ if(NOT index EQUAL -1)
MATH(EXPR filename_index "${index} + 1")
- LIST(GET rc_options ${filename_index} outfile)
- #LIST(REMOVE_AT rc_options ${index} ${filename_index})
- ENDIF(NOT index EQUAL -1)
+ list(GET rc_options ${filename_index} outfile)
+ #list(REMOVE_AT rc_options ${index} ${filename_index})
+ endif(NOT index EQUAL -1)
# - long option scanning
- STRING(REGEX MATCH "--output=[^;]*" outfile_opt "${rc_options}")
- IF(outfile_opt)
- STRING(REPLACE "--output=" "" outfile "${outfile_opt}")
- ENDIF(outfile_opt)
- #STRING(REGEX REPLACE "--output=[^;]*;?" "" rc_options "${rc_options}")
- #STRING(REGEX REPLACE ";$" "" rc_options "${rc_options}")
+ string(REGEX MATCH "--output=[^;]*" outfile_opt "${rc_options}")
+ if(outfile_opt)
+ string(REPLACE "--output=" "" outfile "${outfile_opt}")
+ endif(outfile_opt)
+ #string(REGEX REPLACE "--output=[^;]*;?" "" rc_options "${rc_options}")
+ #string(REGEX REPLACE ";$" "" rc_options "${rc_options}")
- IF(NOT IS_ABSOLUTE "${outfile}")
- SET(outfile "${CMAKE_CURRENT_BINARY_DIR}/${outfile}")
- ENDIF(NOT IS_ABSOLUTE "${outfile}")
- ADD_CUSTOM_COMMAND(
+ if(NOT IS_ABSOLUTE "${outfile}")
+ set(outfile "${CMAKE_CURRENT_BINARY_DIR}/${outfile}")
+ endif(NOT IS_ABSOLUTE "${outfile}")
+ add_custom_command(
OUTPUT "${outfile}"
COMMAND ${wxWidgets_wxrc_EXECUTABLE} ${rc_options} ${rc_file_list_abs}
DEPENDS ${rc_file_list_abs} ${rc_depends}
)
# Add generated header to output file list.
- LIST(FIND rc_options -e short_index)
- LIST(FIND rc_options --extra-cpp-code long_index)
- IF(NOT short_index EQUAL -1 OR NOT long_index EQUAL -1)
- GET_FILENAME_COMPONENT(outfile_ext ${outfile} EXT)
- STRING(REPLACE "${outfile_ext}" ".h" outfile_header "${outfile}")
- LIST(APPEND ${_outfiles} "${outfile_header}")
- SET_SOURCE_FILES_PROPERTIES(
+ list(FIND rc_options -e short_index)
+ list(FIND rc_options --extra-cpp-code long_index)
+ if(NOT short_index EQUAL -1 OR NOT long_index EQUAL -1)
+ get_filename_component(outfile_ext ${outfile} EXT)
+ string(REPLACE "${outfile_ext}" ".h" outfile_header "${outfile}")
+ list(APPEND ${_outfiles} "${outfile_header}")
+ set_source_files_properties(
"${outfile_header}" PROPERTIES GENERATED TRUE
)
- ENDIF(NOT short_index EQUAL -1 OR NOT long_index EQUAL -1)
+ endif(NOT short_index EQUAL -1 OR NOT long_index EQUAL -1)
# Add generated file to output file list.
- LIST(APPEND ${_outfiles} "${outfile}")
+ list(APPEND ${_outfiles} "${outfile}")
- SET(${_outfiles} ${${_outfiles}} PARENT_SCOPE)
-ENDFUNCTION(WXWIDGETS_ADD_RESOURCES)
+ set(${_outfiles} ${${_outfiles}} PARENT_SCOPE)
+endfunction(wxwidgets_add_resources)
