5da1580ada
Fortran: Improve pointer size detection in gfortran on MinGW
...
In commit ecd84147
2013-12-06 09:02:27 -05:00
520ead7200
Merge topic 'cleanup-build-commands'
...
e4201240c55729
2013-12-05 09:24:59 -05:00
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
07528f78d7
Merge topic 'filter-showincludes-in-launcher'
...
e5e3f3d
2013-12-03 09:48:09 -05:00
1af0c41278
Merge topic 'Haiku-CPU-count'
...
eef42a0
2013-12-03 09:30:31 -05:00
2e8ce4d516
Merge topic 'lang-flag-var-helpstrings'
...
5d2452d#14622 )
2b77b53#14606 )
424c6fc#14606 )
2013-12-03 09:30:27 -05:00
da47c9733b
Merge topic 'osx-cross-compile-fixup'
...
3189ed3#14603 )
2013-12-03 09:30:18 -05:00
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
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
ed1de30da0
Merge topic 'wix-components'
...
7b390f7
2013-12-02 12:07:24 -05:00
55f2a3d627
Merge topic 'FindSWIG-3498'
...
5d3b0bb#3498 )
2013-12-02 12:07:17 -05:00
fa894c3003
Merge topic 'UseSWIG-octave'
...
f39671c
2013-12-02 12:07:03 -05:00
f3a10191e7
Merge topic 'UseSWIG-fix12184'
...
74f5545#12184 )
2013-12-02 12:06:57 -05:00
406635fd6c
Merge topic 'UseSWIG-fix13318'
...
a87c063#13318 )
2013-12-02 12:06:50 -05:00
9c56366250
Merge topic 'KateProjectGenerator2'
...
b54c3369414217644e012
2013-12-02 12:06:27 -05:00
eef42a0de6
ProcessorCount: make it work on Haiku
2013-12-02 17:51:47 +01:00
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
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
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
5d3b0bb501
FindSWIG: allow to provide SWIG_DIR ( #3498 )
2013-12-01 01:20:46 +01:00
f39671c117
UseSWIG: Handle octave extensions.
2013-11-29 10:13:27 +01:00
74f5545d0a
UseSWIG: set .bundle ext on OSX and no prefix ( #12184 )
2013-11-28 10:26:14 +01:00
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
a87c06328c
UseSWIG: Name python module according to swig flags ( #13318 )
2013-11-26 09:46:39 -05:00
8b585eed44
Merge topic 'cross-compiling-toolchain-variables'
...
89ba7b0
2013-11-26 09:38:55 -05:00
784e6e7f15
Merge topic 'UseSWIG-fix14520'
...
20028d6#14520 )
2013-11-26 09:36:46 -05:00
0ccc535734
Merge topic 'UseSWIG-fix13814'
...
acc59e5#13814 )
2013-11-26 09:36:22 -05:00
170c50da38
Merge topic 'FindGTK2-quartz-backend'
...
0e9bf6a
2013-11-26 09:35:13 -05:00
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
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
d6516dc693
Merge topic 'EclipseParallelMakeOnlyOnUnixHosts'
...
83751af
2013-11-25 08:38:07 -05:00
788910941f
Merge topic 'UseSWIG-fix13772'
...
276e373
2013-11-25 08:37:59 -05:00
f1d5d88911
Merge topic 'FindSWIG-fix13771'
...
8c127c9#13771 )
2013-11-25 08:37:53 -05:00
adde0c6324
Merge topic 'FindSWIG-fix13449'
...
19b7a54#13449 )
2013-11-25 08:37:47 -05:00
7008754b0e
Merge topic 'FindSWIG-fix13426'
...
6620dc7#13426 )
2013-11-25 08:37:34 -05:00
20028d600f
UseSWIG: Remove duplicate include dirs ( #14520 )
...
Shorten the swig command line.
2013-11-25 08:33:30 -05:00
acc59e55e1
UseSWIG: Handle a dll name different than module name ( #13814 )
2013-11-25 08:32:13 -05:00
276e3735d8
UseSWIG: Fix .i relative source file location (#13173,#13772,#14459)
2013-11-25 08:29:37 -05:00
0e9bf6a257
FindGTK2: Add support for Quartz backend on MAC
...
Fix issue #14593
2013-11-24 14:53:47 +01:00
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
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
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
6620dc7691
FindSWIG: Mark SWIG_DIR & SWIG_VERSION as advanced ( #13426 )
2013-11-22 09:09:20 -05:00
7246e635fe
Merge topic 'FixIssue14029'
...
9619719#14029 )
2013-11-22 08:41:43 -05:00
3013a11826
Merge topic 'cross-compiling-toolchain-variables'
...
7521da2
2013-11-22 08:40:50 -05:00
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
91330e9505
Merge topic 'FindwxWidgets-3.0.0'
...
2cd5597#14587 )
2013-11-21 09:39:07 -05:00
26bed2ac57
Merge topic 'find_backtrace'
...
c6f339c
2013-11-21 09:38:56 -05:00
7521da2852
Introduce CMAKE_STAGING_PREFIX variable.
...
This variable can be useful in cross-compiling contexts where the
sysroot is read-only or where the sysroot should otherwise remain
pristine.
If the new CMAKE_STAGING_PREFIX variable is set, it is used instead
of CMAKE_INSTALL_PREFIX when generating the installation rules in
cmake_install.cmake.
This way, the CMAKE_INSTALL_PREFIX variable
always refers to the installation prefix on the target device, regardless
of whether host==target.
If any -rpath paths passed to the linker contain the CMAKE_STAGING_PREFIX,
the matching path fragments are replaced with the CMAKE_INSTALL_PREFIX.
Matching paths in the -rpath-link are not transformed.
The cross-prefix usr-move workaround is assumed not to require extension
regarding CMAKE_STAGING_PREFIX. The staging area is a single prefix, so
there is no scope for cross-prefix symlinks. The CMAKE_INSTALL_PREFIX
is still used to determine the workaround path, and that variable
remains the relevant one even if CMAKE_STAGING_PREFIX is used. If the
generated export files are deployed to the target, the workaround
will still be in place, and still be employed if required.
2013-11-21 11:48:03 +01:00
2cd559789b
FindwxWidgets: Add support for wxWidgets 3.0.0 ( #14587 )
...
Add the "wxWidgets-3.0.0" path suffix and the "30" library names.
While at it, add the "wxWidgets-2.9.5" suffix too.
2013-11-20 10:51:55 -05:00
Brad King
Nils Gladitz
Rolf Eike Beer
Flynn Marquardt
Julien Schueller
Stephen Kelly
Alex Neundorf
Daniele E. Domenichelli
Benjamin Eikel
Arnaud Desmier