kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
22,728 Commits 1 Branch 14 Tags 53 MiB
Commit Graph

4657 Commits

Author SHA1 Message Date
Brad King 1c95ec6316 Merge topic 'qt4-qmake-exe' 
05c518b FindQt4: Restore ability to handle a changed QT_QMAKE_EXECUTABLE properly.
 2013-12-09 10:33:11 -05:00
Simon Sasburg 05c518b3de FindQt4: Restore ability to handle a changed QT_QMAKE_EXECUTABLE properly. 
This fixes a regression in commit 21123416 where it was trying to better handle
a qmake from Qt5.
 2013-12-06 08:07:38 -07:00
Brad King 5da1580ada Fortran: Improve pointer size detection in gfortran on MinGW 
In commit ecd84147 (Fortran: Detect pointer size in gfortran on MinGW,
2011-11-29) we started testing for __SIZEOF_POINTER__ but not all GNU
Fortran compilers define this.  Check also for __SIZEOF_SIZE_T__ which
at least one version of gfortran defines without also defining
__SIZEOF_POINTER__.
 2013-12-06 09:02:27 -05:00
Brad King 520ead7200 Merge topic 'cleanup-build-commands' 
e420124 CMakeDetermineCompilerId: Use CMAKE_VS_(DEVENV|MSBUILD|MSDEV)_COMMAND
0c55729 VS: Add CMAKE_VS_(DEVENV|MSBUILD|MSDEV)_COMMAND variables
 2013-12-05 09:24:59 -05:00
Brad King e4201248ce CMakeDetermineCompilerId: Use CMAKE_VS_(DEVENV|MSBUILD|MSDEV)_COMMAND 
In the code path for launching the VS IDE tools, avoid using
CMAKE_MAKE_PROGRAM.  Instead use the variables CMAKE_VS_DEVENV_COMMAND,
CMAKE_VS_MSBUILD_COMMAND, and CMAKE_VS_MSDEV_COMMAND to lookup the
location of the build tool needed.  Choose the proper tool based on
availability and necessity for the language (e.g. Intel Fortran must
build with devenv.com and not MSBuild.exe).
 2013-12-04 11:06:44 -05:00
Brad King 07528f78d7 Merge topic 'filter-showincludes-in-launcher' 
e5e3f3d CTest: filter /showIncludes output from ninja compile launcher
 2013-12-03 09:48:09 -05:00
Brad King 1af0c41278 Merge topic 'Haiku-CPU-count' 
eef42a0 ProcessorCount: make it work on Haiku
 2013-12-03 09:30:31 -05:00
Brad King 2e8ce4d516 Merge topic 'lang-flag-var-helpstrings' 
5d2452d Fix CMAKE_(C|CXX|Fortran)_STANDARD_LIBRARIES helpstrings (#14622)
2b77b53 Make CMAKE_(C|CXX|Fortran)_<CONFIG> help strings more consistent (#14606)
424c6fc Fix CMAKE_(C|CXX|Fortran)_RELEASE helpstrings (#14606)
 2013-12-03 09:30:27 -05:00
Brad King da47c9733b Merge topic 'osx-cross-compile-fixup' 
3189ed3 OS X: Fix app bundle search path during cross compiling (#14603)
 2013-12-03 09:30:18 -05:00
Nils Gladitz e5e3f3d4ff CTest: filter /showIncludes output from ninja compile launcher 
Teach "ctest --launch" a new "--filter-prefix" option.  Set it using
the CMAKE_CL_SHOWINCLUDES_PREFIX value with the Ninja generator.
 2013-12-03 09:25:53 -05:00
Brad King 5d2452d89a Fix CMAKE_(C|CXX|Fortran)_STANDARD_LIBRARIES helpstrings (#14622) 
s/defalut/default/

Reported-by: Stephan Tolksdorf <st@quanttec.com>
 2013-12-03 09:21:33 -05:00
Brad King ed1de30da0 Merge topic 'wix-components' 
7b390f7 CPackWiX: add CPack component support
 2013-12-02 12:07:24 -05:00
Brad King 55f2a3d627 Merge topic 'FindSWIG-3498' 
5d3b0bb FindSWIG: allow to provide SWIG_DIR (#3498)
 2013-12-02 12:07:17 -05:00
Brad King fa894c3003 Merge topic 'UseSWIG-octave' 
f39671c UseSWIG: Handle octave extensions.
 2013-12-02 12:07:03 -05:00
Brad King f3a10191e7 Merge topic 'UseSWIG-fix12184' 
74f5545 UseSWIG: set .bundle ext on OSX and no prefix (#12184)
 2013-12-02 12:06:57 -05:00
Brad King 406635fd6c Merge topic 'UseSWIG-fix13318' 
a87c063 UseSWIG: Name python module according to swig flags (#13318)
 2013-12-02 12:06:50 -05:00
Brad King 9c56366250 Merge topic 'KateProjectGenerator2' 
b54c336 kate: add some documentation
9414217 kate: insert build targets
644e012 kate: add project generator for the Kate project plugin
 2013-12-02 12:06:27 -05:00
Rolf Eike Beer eef42a0de6 ProcessorCount: make it work on Haiku 2013-12-02 17:51:47 +01:00
Brad King 2b77b53280 Make CMAKE_(C|CXX|Fortran)_<CONFIG> help strings more consistent (#14606) 
Use consistent capitalization and write all words out in the cache entry
descriptions.
 2013-12-02 10:41:12 -05:00
Brad King 424c6fcc76 Fix CMAKE_(C|CXX|Fortran)_RELEASE helpstrings (#14606) 
Remove the platform-specific description from the cache entry help
strings for these variables.
 2013-12-02 10:25:52 -05:00
Flynn Marquardt 3189ed34b8 OS X: Fix app bundle search path during cross compiling (#14603) 
In "Modules/Platform/Darwin.cmake" the variable _apps_paths stays empty
if cross compiling.  Do not de-duplicate an empty list.
 2013-12-02 09:32:40 -05:00
Julien Schueller 5d3b0bb501 FindSWIG: allow to provide SWIG_DIR (#3498) 2013-12-01 01:20:46 +01:00
Julien Schueller f39671c117 UseSWIG: Handle octave extensions. 2013-11-29 10:13:27 +01:00
Julien Schueller 74f5545d0a UseSWIG: set .bundle ext on OSX and no prefix (#12184) 2013-11-28 10:26:14 +01:00
Nils Gladitz 7b390f75e8 CPackWiX: add CPack component support 
Creates a hierarchy of WiX features from CPack components and component groups.
Switch to the FeatureTree UI in case components have been defined.
Handles the component REQUIRE and HIDDEN options
and the component group EXPANDED option.
 2013-11-26 22:15:57 +01:00
Julien Schueller a87c06328c UseSWIG: Name python module according to swig flags (#13318) 2013-11-26 09:46:39 -05:00
Brad King 8b585eed44 Merge topic 'cross-compiling-toolchain-variables' 
89ba7b0 Update the Clang pattern to specify compiler options.
 2013-11-26 09:38:55 -05:00
Brad King 784e6e7f15 Merge topic 'UseSWIG-fix14520' 
20028d6 UseSWIG: Remove duplicate include dirs (#14520)
 2013-11-26 09:36:46 -05:00
Brad King 0ccc535734 Merge topic 'UseSWIG-fix13814' 
acc59e5 UseSWIG: Handle a dll name different than module name (#13814)
 2013-11-26 09:36:22 -05:00
Brad King 170c50da38 Merge topic 'FindGTK2-quartz-backend' 
0e9bf6a FindGTK2: Add support for Quartz backend on MAC
 2013-11-26 09:35:13 -05:00
Stephen Kelly 89ba7b0046 Update the Clang pattern to specify compiler options. 
In Clang 3.4, the preferred (and new) option pattern is --target=.

 http://thread.gmane.org/gmane.comp.compilers.clang.devel/29975
 http://llvm.org/viewvc/llvm-project?view=revision&revision=184408

Clang 3.4 is not yet released, but there is a release candidate, and
there is a dashboard test of Clang trunk.
 2013-11-25 23:01:21 +01:00
Alex Neundorf 644e012863 kate: add project generator for the Kate project plugin 
This patch adds an extra generator for KDE's kate text editor,
or better more specifically, the project plugin.

Alex
 2013-11-25 10:48:33 -05:00
Brad King d6516dc693 Merge topic 'EclipseParallelMakeOnlyOnUnixHosts' 
83751af Eclipse: add -j only on UNIX hosts
 2013-11-25 08:38:07 -05:00
Brad King 788910941f Merge topic 'UseSWIG-fix13772' 
276e373 UseSWIG: Fix .i relative source file location (#13173,#13772,#14459)
 2013-11-25 08:37:59 -05:00
Brad King f1d5d88911 Merge topic 'FindSWIG-fix13771' 
8c127c9 FindSWIG: Use CMAKE_CURRENT_LIST_DIR instead of CMAKE_ROOT (#13771)
 2013-11-25 08:37:53 -05:00
Brad King adde0c6324 Merge topic 'FindSWIG-fix13449' 
19b7a54 FindSWIG: Search for swig.swg only on host (#13449)
 2013-11-25 08:37:47 -05:00
Brad King 7008754b0e Merge topic 'FindSWIG-fix13426' 
6620dc7 FindSWIG: Mark SWIG_DIR & SWIG_VERSION as advanced (#13426)
 2013-11-25 08:37:34 -05:00
Julien Schueller 20028d600f UseSWIG: Remove duplicate include dirs (#14520) 
Shorten the swig command line.
 2013-11-25 08:33:30 -05:00
Julien Schueller acc59e55e1 UseSWIG: Handle a dll name different than module name (#13814) 2013-11-25 08:32:13 -05:00
Julien Schueller 276e3735d8 UseSWIG: Fix .i relative source file location (#13173,#13772,#14459) 2013-11-25 08:29:37 -05:00
Daniele E. Domenichelli 0e9bf6a257 FindGTK2: Add support for Quartz backend on MAC 
Fix issue #14593
 2013-11-24 14:53:47 +01:00
Alex Neundorf 83751af219 Eclipse: add -j only on UNIX hosts 
The previous version added -jN to the make invokation if UNIX
was set, but this was true also when cross compiling.
What we are actually interested in is CMAKE_HOST_UNIX, i.e.
whether the build host is UNIX.
Or we should check more exactly what CMAKE_MAKE_PROGRAM is.

Alex
 2013-11-23 23:48:43 +01:00
Julien Schueller 8c127c9e33 FindSWIG: Use CMAKE_CURRENT_LIST_DIR instead of CMAKE_ROOT (#13771) 
This is a simpler way to reference the location of UseSWIG.cmake.
 2013-11-22 09:10:51 -05:00
Julien Schueller 19b7a54d35 FindSWIG: Search for swig.swg only on host (#13449) 
Use NO_CMAKE_FIND_ROOT_PATH to ensure swig.swg can be found on the host
even when cross-compiling.
 2013-11-22 09:09:43 -05:00
Julien Schueller 6620dc7691 FindSWIG: Mark SWIG_DIR & SWIG_VERSION as advanced (#13426) 2013-11-22 09:09:20 -05:00
Brad King 7246e635fe Merge topic 'FixIssue14029' 
9619719 FindSDL: Add additional search paths on MSVC (#14029)
 2013-11-22 08:41:43 -05:00
Brad King 3013a11826 Merge topic 'cross-compiling-toolchain-variables' 
7521da2 Introduce CMAKE_STAGING_PREFIX variable.
 2013-11-22 08:40:50 -05:00
Benjamin Eikel 9619719882 FindSDL: Add additional search paths on MSVC (#14029) 
Add an architecture-specific library directory path suffix for each
component.  Use different search path for SDL_sound.  Project files in
VisualC directory suggest that a win32lib will hold the libraries.

Reported-by: Paul Hampson <Paul.Hampson@Pobox.com>
 2013-11-21 15:30:36 -05:00
Brad King 91330e9505 Merge topic 'FindwxWidgets-3.0.0' 
2cd5597 FindwxWidgets: Add support for wxWidgets 3.0.0 (#14587)
 2013-11-21 09:39:07 -05:00
Brad King 26bed2ac57 Merge topic 'find_backtrace' 
c6f339c Add FindBacktrace.cmake module.
 2013-11-21 09:38:56 -05:00