realAscot/kicad-source
1
0
Fork 0
mirror of https://gitlab.com/kicad/code/kicad.git synced 2025-09-14 02:03:12 +02:00
Code Issues Packages Projects Releases Wiki Activity
23,675 Commits 11 Branches 130 Tags
Commit Graph

42 Commits

Author SHA1 Message Date
Marek Roszko
ff977b050a Fix FindwxWidgets.cmake on vcpkg so that it fully completes 2020-10-14 19:18:38 -04:00
Jon Evans
d5140d87cd Fix indentation in previous commit 2019-11-29 21:22:56 -05:00
Jon Evans
719a70b510 Update FindwxWidgets.cmake to work under MSW/vcpkg 
Taken from: https://github.com/CaeruleusAqua/vcpkg-wx-find/blob/master/FindwxWidgets.cmake
 2019-11-29 21:11:44 -05:00
Jan Mrázek
ade263f30d Check required libraries in FindwxWidgets.cmake 
Both official one and KiCad one version of FindwxWidgets.cmake do not check if
all the required components are part of the wxWidgets build. This couses trouble
on Ubuntu when user misses libwxgtk3.0-dev package - CMake succeeds, build does
not.

This fix was accepted also to the CMake 3.9 upstream
(https://gitlab.kitware.com/cmake/cmake/merge_requests/704).

Fixes: lp:1630020
* https://bugs.launchpad.net/kicad/+bug/1630020
 2017-04-26 20:43:29 -04:00
Simon Richter
4ee956d77a FindwxWidgets.cmake: Remove extra newline 2016-02-15 18:50:49 +01:00
Simon Richter
ff99b51b7d FindwxWidgets.cmake: Report failure of wx-config when looking for components 2016-02-15 18:50:49 +01:00
Simon Richter
4c29843813 FindwxWidgets.cmake: Use ENV foo rather than ENV{foo} 2016-02-15 18:50:49 +01:00
Simon Richter
9d08d93c26 FindwxWidgets.cmake: Add comment describing code block 2016-02-15 18:50:49 +01:00
Simon Richter
380bb37931 FindwxWidgets.cmake: Reformat documentation 2016-02-15 18:50:49 +01:00
Simon Richter
c109abb87e FindwxWidgets.cmake: Do not explicitly declare FOUND_VAR, unnecessary 2016-02-15 18:50:49 +01:00
Simon Richter
801611fad8 FindwxWidgets.cmake: Drop nonsensical assignment 
No idea where that came from, but it is almost certainly an error.
 2016-02-15 18:50:48 +01:00
Simon Richter
f7d8a412cf FindwxWidgets.cmake: Determine version even when not asked to 2016-02-15 18:50:48 +01:00
Simon Richter
029a3ba61e FindwxWidgets.cmake: Improve regex for version number matches 2016-02-15 18:50:48 +01:00
Simon Richter
2f1bbdc0f3 FindwxWidgets.cmake: Simplify MATCHES 
Arbitrary characters at beginning and end of the line are implicitly allowed anyway
 2016-02-15 18:50:48 +01:00
Simon Richter
ea4c8c546f FindwxWidgets.cmake: Expect directory layout for MSVC 64 bit 
On 64 bit MSVC, the DLLs and import libraries are placed in a directory
called vc_x64, to allow parallel installation of 32 and 64 bit wxWidgets.
 2016-02-15 18:50:48 +01:00
Simon Richter
51a1588456 FindwxWidgets.cmake: documentation for variables 2016-02-15 18:50:48 +01:00
Simon Richter
bbd0c539e9 FindwxWidgets.cmake: Look for versioned wx-config scripts 2016-02-15 18:50:48 +01:00
Simon Richter
bc480a010b FindwxWidgets.cmake: Fix indentation 2016-02-15 18:50:48 +01:00
Simon Richter
38359272c4 FindwxWidgets.cmake: Show line number in debug output 2016-02-15 18:50:48 +01:00
Simon Richter
9ff394e72a FindwxWidgets.cmake: Treat CygWin as unix rather than undefined 2016-02-15 18:50:48 +01:00
Simon Richter
b66a584a8a FindwxWidgets.cmake: Use lowercase for CMake builtins 2016-02-15 18:50:48 +01:00
Simon Richter
6a7fa8950c FindwxWidgets.cmake: Use uppercase for macro names 2016-02-15 18:50:47 +01:00
Simon Richter
78a0316a08 FindwxWidgets.cmake: Use uppercase for DBG_MSG macro 2016-02-15 18:50:47 +01:00
Simon Richter
b7adcb3728 FindwxWidgets.cmake: drop a few dbg_msg invocations 2016-02-15 18:48:40 +01:00
Simon Richter
86d072b5d1 FindwxWidgets.cmake: Remove arguments from else() and end*() 
To reduce differences with upstream FindwxWidgets.cmake, use their style of
ending blocks.
 2016-02-15 18:48:40 +01:00
Wayne Stambaugh
99ba5259a6 Undo commit r6456 which completely breaks building on MSYS2/MingGW. 2016-01-12 21:50:18 -05:00
Simon Richter
b09c88042b Synchronize FindwxWidgets.cmake with CMake project 2016-01-12 20:33:13 -05:00
Simon Wells
9362a6ec24 Update FindwxWidgets.cmake to new version without -isystem 
See: https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4d05f195
 2016-01-11 17:15:48 -05:00
jean-pierre charras
9b7ef20be9 Fix install issue after removing freeroute.jnl, now useless because freeroute is no more accessible via the web. 
(Kicad is still able to run freeroute if freeroute.jar is accessible)
add wxWidgets-3.0.2 folder detection in FindwxWidgets.cmake
 2014-12-22 12:55:33 +01:00
jean-pierre charras
7231dd362c FindwxWidgets.cmake: fix missing webview library name in library list to analyze. this fixes missing symbols issue in winbuilder. 2014-12-22 10:31:45 +01:00
Wayne Stambaugh
fa9f2f0439 Fix MSYS2 build configuration issues. 2014-10-19 14:36:41 -04:00
Wayne Stambaugh
21ca86573f Fix a minor bug in FindwxWidgets.cmake version.h path search. 2014-09-30 18:43:20 -04:00
Wayne Stambaugh
5598113a45 Minor build bug fixes. 
* Remove ${CMAKE_CURRENT_LIST_DIR} copied FindPackageHandleStandardArgs.cmake.
* Comment out debug messages in FindwxWidgets.cmake.
 2014-09-26 20:28:12 -04:00
Wayne Stambaugh
ed19967099 Force wxWidgets to version 3.0.0 or later and OSX build fixes. 
* Add version detection to FindwxWidgets.cmake
* Convert commands and macro names to lower case in FindwxWidgets.cmake.
* Use find_package_handle_standard_args() to handle version comparison.
* Update FindPackageHandleStandardArgs.cmake from CMake 3.0.2 to get the
  latest bug fixes.
* Add an option to ignore building every OSX dependency from source and
  use find_package() the way it is supposed to work unless the developer
  specifically requests building everything from source.
 2014-09-26 17:52:56 -04:00
Wayne Stambaugh
547524cd0a Fix bug in FindwxWidgets.cmake. 
* Fix C flag parser when there is more than one flag defined after includes when
   wx-config --cflags is called.
 2014-08-22 16:40:17 -04:00
Dick Hollenbeck
8dc7189653 Add EDA_APP::setLanguageId() accessor and fix FindwxWidgets.cmake for windows cross on linux. 2014-01-20 03:33:17 -06:00
Brian Sidebotham
51e3d8943f * Fix FindwxWidgets.cmake for V3.0 wxWidgets using 'win32' style find. i.e. for MinGW native build without msys or cygwin 2014-01-09 23:13:22 +00:00
Dick Hollenbeck
8ccf0320b4 1) Add "rules" to base of tree for copying into BZR_HOME/rules. 
File "rules" has instructional text as comments near top.

2) Convert all text files in repo to LF line ending form.
   Any checkout done with "rules" in play will convert the working
   tree to native line ending, while keeping repo as LF line ending.
 2013-05-25 23:36:44 -05:00
Wayne Stambaugh
e764474f9d CMake and other minor improvements. 
* Merged CMake 2.8.4 version of FindwxWidgets.cmake with local copy.
* Merged CMake 2.8.4 version of UsewxWidgets.cmake with local copy.
* Bump required version of CMake to 2.8.0.
* Delete commented out include from eeschema/protos.h that I forgot on my
  last commit.
 2011-04-06 09:44:38 -04:00
stambaughw
17bf24354e Build fixes for VC8, compiler warnings fixed, and some minor wxDC zoom changes. 
* Added modified version of FindwxWidgets.cmake to prevent manifest build and link errors
  with VC8.
* Fixed ambiguous math function ( sqrt, atan, cos, etc. ) call errors when building
  with MSVC.
* Moved bitmap copy bitmap source file destination to the build path to prevent source
  tree pollution and library rebuilds when building on different platforms.
 2009-06-26 17:24:32 +00:00
f3nix
72b5e06f2e These files are not needed for cross-compile to work. Additionaly they make maintenance a PITA. 2009-06-21 13:31:49 +00:00
strangeril
831517fb20 Added wxWidget related cmake files to make crosscompiling possible 2009-06-19 06:34:51 +00:00