summaryrefslogtreecommitdiffstats
path: root/Modules/FindwxWidgets.cmake
Commit message (Collapse)AuthorAgeFilesLines
* FindwxWidgets: Use more private name for local variableAndrea Ranieri2018-04-111-4/+6
| | | | | Avoid using a `_filename` variable that may be set by project code. Also unset the variable name that we do use to avoid conflict.
* Merge topic 'findwxwidgets-msys-library-dirs'Brad King2018-04-051-0/+20
|\ | | | | | | | | | | | | 44ad8e48de FindwxWidgets: Fix wxWidgets_LIBRARY_DIRS on Cygwin/MSYS Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1930
| * FindwxWidgets: Fix wxWidgets_LIBRARY_DIRS on Cygwin/MSYSARATA Mizuki2018-04-041-0/+20
| | | | | | | | | | | | | | | | | | | | The check for `wxWidgets_LIBRARIES` variable, introduced by e8b77084, fails with the `wx-config` script generated by an MSYS build, because `wxWidgets_LIBRARY_DIRS` is in POSIX style. This commit fixes the problem with `wxWidgets_LIBRARY_DIRS` by converting it to Windows style. The actual code were copied from bf643286, which does the same thing for `wxWidgets_INCLUDE_DIRS`.
* | Modules: Use MSVC_TOOLSET_VERSION variable to simplify logicArkady Shapkin2018-04-041-13/+1
|/
* FindwxWidgets: Add support for MSVC versions of the v141 toolsetAdam Oleksy2018-03-191-6/+6
| | | | | | | | Since commit v3.8.0-rc3~7^2 (FindwxWidgets: Add support for VS 2017 v141 toolset, 2017-03-22) more MSVC updates have been released that use a MSVC_VERSION value higher than 1910. Revise our checks accordingly. Issue: #16735
* Fix eating "-L" in path namesRaffi Enficiaud2018-02-171-1/+1
| | | | | When the path containing the wxLibraries contains a "-L", a "string(REPLACE "-L" ...) replaces the content and results in a wrong path. The regex fixes this.
* wxWidgets: Respect WX_CONFIG and WXRC_CMD env varsChristian Pfeiffer2017-11-191-3/+4
| | | | Issue: #17492
* Fix trivial typos in textluzpaz2017-11-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | Some are user facing. Found using codespell -q 3 --skip="./Utilities" -I .cmake-whitelist.txt` whereby the whitelist contained: ans dum helpfull emmited emmitted buil iff isnt nto ot pathes substract te todays upto whitespaces
* FindwxWidgets: Add support for Windows XP compatible builsTomasz Słodkowicz2017-08-301-0/+4
| | | | | | | Microsoft has dedicated toolset versions for XP compatible binaries (v110 vs. v110_xp, v141 vs. v141_xp) and CMake doesn't find wxWidgets compiled with _xp tools. This patch adds _xp to directories searched for wxWin libraries.
* FindwxWidgets: Fix parsing of cxxflags when paths contain -D or -IThierry Crozat2017-06-191-19/+15
| | | | | | | Use proper command-line parsing rather than accidentally matching content in the middle of paths that looks like flags. Fixes: #16986
* FindwxWidgets: Verify existence of libraries reported by wx-configJan Mrázek2017-04-201-0/+22
| | | | | | | | | | | When the Ubuntu package `libwxgtk3-dev` is not installed, FindwxWidgets succeeds even the required libraries are not actually found. The reason for that is that `wx-config` does not perform any kind of check and uses hard-coded values. This affects e.g. KiCAD build process and makes it fail with a confusing error message [1]. The solution is to check for presence of every library file obtained from `wx-config`. [1] https://bugs.launchpad.net/kicad/+bug/1630020
* FindwxWidgets: link with the new required libs under MSWVadim Zeitlin2017-04-071-1/+1
| | | | | | Latest wxWidgets git master version and the upcoming 3.1.1 release requires linking with shlwapi and version DLLs. As this does no harm when using the previous versions, just do it unconditionally.
* FindwxWidgets: Add support for VS 2017 v141 toolsetBrad King2017-03-221-1/+3
| | | | Issue: #16735
* FindwxWidgets: Use `MSVC_VERSION` instead of `MSVC##`Brad King2017-03-221-5/+5
|
* FindwxWidgets: Fix finding unversioned VS-built directory prefixesBrad King2016-10-171-12/+22
| | | | | | | | | 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
* Simplify CMake per-source license noticesBrad King2016-09-271-14/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | Per-source copyright/license notice headers that spell out copyright holder names and years are hard to maintain and often out-of-date or plain wrong. Precise contributor information is already maintained automatically by the version control tool. Ultimately it is the receiver of a file who is responsible for determining its licensing status, and per-source notices are merely a convenience. Therefore it is simpler and more accurate for each source to have a generic notice of the license name and references to more detailed information on copyright holders and full license terms. Our `Copyright.txt` file now contains a list of Contributors whose names appeared source-level copyright notices. It also references version control history for more precise information. Therefore we no longer need to spell out the list of Contributors in each source file notice. Replace CMake per-source copyright/license notice headers with a short description of the license and links to `Copyright.txt` and online information available from "https://cmake.org/licensing". The online URL also handles cases of modules being copied out of our source into other projects, so we can drop our notices about replacing links with full license text. Run the `Utilities/Scripts/filter-notices.bash` script to perform the majority of the replacements mechanically. Manually fix up shebang lines and trailing newlines in a few files. Manually update the notices in a few files that the script does not handle.
* FindwxWidgets: Add VS-versioned library directory prefixesBrad King2016-08-251-3/+15
| | | | | | | 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)
* FindwxWidgets: Add version 3.1.0Brad King2016-08-251-0/+1
| | | | Patch-by: Hannes Grobler (Johnny_xy on gitlab.kitware.com)
* Use string(APPEND) in ModulesDaniel Pfeifer2016-07-271-1/+1
| | | | | | | Automate with: find Modules -type f -print0 | xargs -0 perl -i -0pe \ 's/set\(([a-zA-Z0-9_]+)(\s+)"\$\{\1\}([^"])/string(APPEND \1\2"\3/g'
* FindwxWidgets: Resolve Cygwin/MSYS paths to Windows pathsWayne Stambaugh2016-02-171-0/+30
| | | | | | We use `sh wx-config` to launch the `wx-config` tool so that it can run even on Windows. Since it is always a shell script its output may use POSIX paths even on Windows. Use `cygpath` to convert to Windows paths.
* FindwxWidgets: Drop suppression of -isystemBrad King2016-01-111-12/+0
| | | | | | | | | | | | | | This was added by commit v2.8.0~2292 (... Set variable wxWidgets_INCLUDE_DIRS_NO_SYSTEM on the Mac ..., 2008-04-16) and updated by commit v2.8.9~183^2 (FindwxWidgets: Do not use -isystem on OpenBSD, 2012-05-14). Since the underlying cause was never investigated fully we do not know the conditions under which -isystem breaks wxWidgets, but suppressing -isystem is problematic for users that do not want to see warnings in wxWidgets headers. Simply drop the special case for now so we can see whether anyone hits the problem again, at which point it can be investigated in more detail. Reported-by: Simon Wells <swel024@gmail.com>
* Replace http://www.cmake.org URLs with https://cmake.orgBrad King2015-09-251-2/+2
| | | | | | | The latter is now the preferred URL for visiting cmake.org with a browser. Convert using the shell code: git ls-files -z | xargs -0 sed -i 's|http://www\.cmake|https://cmake|g'
* FindwxWidgets: Add wxWidgets webview componentSimon Richter2015-09-091-1/+1
|
* FindwxWidgets: Expect wxWidgets 3.1Simon Richter2015-09-091-1/+5
|
* FindwxWidgets: allow specifying required versionSimon Richter2015-09-091-3/+28
|
* FindwxWidgets: Fix find_program call for versioned namesBrad King2015-06-081-1/+2
| | | | | | | | In commit v3.3.0-rc1~132^2 (FindwxWidgets: Search for wx-config-3.0 in addition to wx-config, 2015-04-29) we added a second (versioned) name to the find_program call. Specifying multiple names requires use of the NAMES option. Add it now. While at it, also add versioned names for 2.9 and 2.8.
* FindwxWidgets: Search for wx-config-3.0 in addition to wx-config (#15540)Orion Poplawski2015-04-291-1/+1
| | | | | The Fedora package installs 'wx-config' as 'wx-config-3.0' so look for the latter name too.
* FindwxWidgets: Add versions 3.0.1 and 3.0.2Christopher Gittner2014-11-261-0/+2
|
* FindwxWidgets: Improve path detection logic when cross-compiling.Richard M. Shaw2014-08-221-4/+3
|
* Remove .* expressions from beginning and end of MATCHES regexsRolf Eike Beer2014-04-141-2/+2
| | | | | | | | | All these expressions work the same: "foo" ".*foo.*" "^.*foo.*$" This assumes that the "Intel*" expressions were meant to be "Intel.*".
* FindwxWidgets: Add support for wxWidgets 3.0.0 (#14587)Arnaud Desmier2013-11-201-0/+6
| | | | | Add the "wxWidgets-3.0.0" path suffix and the "30" library names. While at it, add the "wxWidgets-2.9.5" suffix too.
* Convert builtin help to reStructuredText source filesKitware Robot2013-10-151-57/+86
| | | | | | | | Run the convert-help.bash script to convert documentation: ./convert-help.bash "/path/to/CMake-build/bin" Then remove it.
* FindwxWidgets: Look in x64 directories for MSVC (#14393)Marius Luca2013-09-101-0/+2
| | | | | | When compiling the 64 bit version of wxWidgets using nmake the library folders become vc_x64_lib and vc_x64_dll and can coexist with the win32 version.
* FindwxWidgets: add DOC strings with usual styleAndreas Mohr2013-05-071-3/+5
|
* use the find_* functions ENV parameterRolf Eike Beer2012-08-141-3/+3
| | | | | | | | | Instead of directly passing $ENV{SOMEVAR} to a find_* call pass in ENV SOMEVAR. This will make sure the paths will get correctly handled through different platforms, especially on Windows. Also fixes one place where paths with windows delimiters (\) were hardcoded to use forward slashes.
* Remove CMake-language block-end command argumentsKitware Robot2012-08-131-105/+105
| | | | | | | | | | | | | | | | | Ancient versions of CMake required else(), endif(), and similar block termination commands to have arguments matching the command starting the block. This is no longer the preferred style. Run the following shell code: for c in else endif endforeach endfunction endmacro endwhile; do echo 's/\b'"$c"'\(\s*\)(.\+)/'"$c"'\1()/' done >convert.sed && git ls-files -z -- bootstrap '*.cmake' '*.cmake.in' '*CMakeLists.txt' | egrep -z -v '^(Utilities/cm|Source/kwsys/)' | egrep -z -v 'Tests/CMakeTests/While-Endwhile-' | xargs -0 sed -i -f convert.sed && rm convert.sed
* Convert CMake-language commands to lower caseKitware Robot2012-08-131-356/+356
| | | | | | | | | | | | | | | | | Ancient CMake versions required upper-case commands. Later command names became case-insensitive. Now the preferred style is lower-case. Run the following shell code: cmake --help-command-list | grep -v "cmake version" | while read c; do echo 's/\b'"$(echo $c | tr '[:lower:]' '[:upper:]')"'\(\s*\)(/'"$c"'\1(/g' done >convert.sed && git ls-files -z -- bootstrap '*.cmake' '*.cmake.in' '*CMakeLists.txt' | egrep -z -v '^(Utilities/cm|Source/kwsys/)' | xargs -0 sed -i -f convert.sed && rm convert.sed
* Remove trailing whitespace from most CMake and C/C++ codeKitware Robot2012-08-131-16/+16
| | | | | | | | | | | | | | | | | Our Git commit hooks disallow modification or addition of lines with trailing whitespace. Wipe out all remnants of trailing whitespace everywhere except third-party code. Run the following shell code: git ls-files -z -- \ bootstrap doxygen.config '*.readme' \ '*.c' '*.cmake' '*.cpp' '*.cxx' \ '*.el' '*.f' '*.f90' '*.h' '*.in' '*.in.l' '*.java' \ '*.mm' '*.pike' '*.py' '*.txt' '*.vim' | egrep -z -v '^(Utilities/cm|Source/(kwsys|CursesDialog/form)/)' | egrep -z -v '^(Modules/CPack\..*\.in)' | xargs -0 sed -i 's/ \+$//'
* FindwxWidgets: Do not use -isystem on OpenBSD (#13219)Anthony J. Bentley2012-05-141-2/+2
| | | | | | Set wxWidgets_INCLUDE_DIRS_NO_SYSTEM on OpenBSD in addition to Apple to prevent UsewxWidgets.cmake from using the include_directories SYSTEM option.
* FindwxWidgets: Add webview library (#12636)Jason Erb2011-12-221-1/+1
| | | | Update for wxWidgets 2.9.3 to include webview component.
* Modules: Include builtin FindPackageHandleStandardArgs directlyBrad King2011-01-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The FindPackageHandleStandardArgs module was originally created outside of CMake. It was added for CMake 2.6.0 by commit e118a627 (add a macro FIND_PACKAGE_HANDLE_STANDARD_ARGS..., 2007-07-18). However, it also proliferated into a number of other projects that at the time required only CMake 2.4 and thus could not depend on CMake to provide the module. CMake's own find modules started using the module in commit b5f656e0 (use the new FIND_PACKAGE_HANDLE_STANDARD_ARGS in some of the FindXXX modules..., 2007-07-18). Then commit d358cf5c (add 2nd, more powerful mode to find_package_handle_standard_args, 2010-07-29) added a new feature to the interface of the module that was fully optional and backward compatible with all existing users of the module. Later commit 5f183caa (FindZLIB: use the FPHSA version mode, 2010-08-04) and others shortly thereafter started using the new interface in CMake's own find modules. This change was also backward compatible because it was only an implementation detail within each module. Unforutnately these changes introduced a problem for projects that still have an old copy of FindPackageHandleStandardArgs in CMAKE_MODULE_PATH. When any such project uses one of CMake's builtin find modules the line include(FindPackageHandleStandardArgs) loads the copy from the project which does not have the new interface! Then the including find module tries to use the new interface with the old module and fails. Whether this breakage can be considered a backward incompatible change in CMake is debatable. The situation is analagous to copying a standard library header from one version of a compiler into a project and then observing problems when the next version of the compiler reports errors in its other headers that depend on its new version of the original header. Nevertheless it is a change to CMake that causes problems for projects that worked with previous versions. This problem was discovered during the 2.8.3 release candidate cycle. It is an instance of a more general problem with projects that provide their own versions of CMake modules when other CMake modules depend on them. At the time we resolved this instance of the problem with commit b0118402 (Use absolute path to FindPackageHandleStandardArgs.cmake everywhere, 2010-09-28) for the 2.8.3 release. In order to address the more general problem we introduced policy CMP0017 in commit db44848f (Prefer files from CMAKE_ROOT when including from CMAKE_ROOT, 2010-11-17). That change was followed by commit ce28737c (Remove usage of CMAKE_CURRENT_LIST_DIR now that we have CMP0017, 2010-12-20) which reverted the original workaround in favor of using the policy. However, existing project releases do not set the policy behavior to NEW and therefore still exhibit the problem. We introduced in commit a364daf1 (Allow users to specify defaults for unset policies, 2011-01-03) an option for users to build existing projects by adding -DCMAKE_POLICY_DEFAULT_CMP0017=NEW to the command line. Unfortunately this solution still does not allow such projects to build out of the box, and there is no good way to suggest the use of the new option. The only remaining solution to keep existing projects that exhibit this problem building is to restore the change originally made in commit b0118402 (Use absolute path to FindPackageHandleStandardArgs.cmake everywhere, 2010-09-28). This also avoids policy CMP0017 warnings for this particular instance of the problem the policy addresses.
* Remove usage of CMAKE_CURRENT_LIST_DIR now that we have CMP0017Alex Neundorf2011-01-041-1/+1
| | | | | | | | This puts the new search behaviour for included files in action, i.e. now when a file from Modules/ include()s another file, it also gets the one from Modules/ included, i.e. the one it expects. Alex
* Use absolute path to FindPackageHandleStandardArgs.cmake everywhereAlex Neundorf2010-09-281-1/+1
| | | | | | | This is to avoid getting an (older) copy of FPHSA.cmake which is e.g. installed with KDE 4.5.0 and 4.5.1. Alex
* ENH #8993: FindwxWidgets add support for wx-config custom options.Miguel A. Figueroa-Villanueva2010-09-051-5/+15
| | | | | Added suport for setting a custom toolkit, refix, etc. when using wx-config.
* BUG #8184: Fixed FindwxWidgets wrong order of default libs for MinGW.Miguel A. Figueroa-Villanueva2010-09-011-4/+5
| | | | | Also fixed usage sample in comments, which can be misleading for MinGW users as demonstrated by mantis issue #10089.
* BUG #11123: Generic include dir should come after config specific one.Miguel A. Figueroa-Villanueva2010-09-011-10/+10
|
* BUG #10658: FindwxWidgets USE_FILE should not include .cmake extension.Miguel A. Figueroa-Villanueva2010-09-011-1/+1
| | | | | The wxWidgets_USE_FILE variable to be used with the include command should be set to UsewxWidgets; not UsewxWidgets.cmake.
* BUG: #9775 Fixed patch FindwxWidgets-fixed-bug-9775.Miguel A. Figueroa-Villanueva2010-08-301-2/+3
| | | | Forgot to add new libraries in list of libs to be cleared.
* ENH: #9775 Added support for new wxWidgets 2.9 libraries.Miguel A. Figueroa-Villanueva2010-08-291-2/+3
| | | | | | Added support for new libraries in wxWidgets 2.9 that are part of the main distribution. These are: wxPropertyGrid, wxSTC, wxScintilla, and wxRibbon.
* Modules: Fix spelling 'To distributed' -> 'To distribute'Todd Gamblin2010-08-091-1/+1
|
generated by cgit v0.12 at 2024-12-26 19:10:59 (GMT)