733726edf6
find_library: Fix mixed lib->lib64 (non-)conversion cases ( #13419 )
...
When a search path contains multiple "lib/" instances we previously
converted all or none. This fails for cases where only some of the
multiple instances must be converted. Teach AddArchitecturePaths to
generate all combinations that exist. Uncomment these cases in the
CMakeOnly.find_library test now that they work.
2012-07-20 14:19:11 -04:00
54add62f1b
find_library: Simplify lib->lib<arch> expansion
...
Simplify cmFindLibraryCommand::AddArchitecturePaths logic to avoid
recording a separate 'found' status and populating an entire
vector<string> just to throw it away.
2012-07-20 14:19:10 -04:00
6ca2f82d0d
find_library: Refactor lib->lib64 conversion
...
Previously methods AddArchitecturePaths and AddLib64Paths were almost
identical. Replace the latter with a call to the former. Fix the
AddArchitecturePaths implementation to add trailing slashes to all
tested paths.
2012-07-20 14:19:08 -04:00
1fe4b82a45
find_library: Add test covering lib->lib64 cases
...
Add a "CMakeOnly.find_library" test covering various cases involving
lib->lib64 (non-)conversion. Comment out cases involving mixed path
components "lib" and "lib64", such as lib/A/lib64 and lib64/A/lib, as
these are known to be broken currently.
2012-07-20 14:19:07 -04:00
b47cffa9b8
CPack: Use bin subdir when looking for dpkg and rpmbuild
2012-07-20 11:53:56 -04:00
4ddd3b9fd1
Use OUTPUT_NORMAL instead of OUTPUT_MERGE for cmake -E chdir.
...
Using OUTPUT_MERGE can cause the output to be jumbled in some cases.
2012-07-20 11:09:52 -04:00
9f7dc83917
Ninja: also bootstrap ninja files
2012-07-20 11:08:36 +02:00
5d365b26ec
Ninja: enable ninja support everywhere
2012-07-20 10:53:34 +02:00
caeca30936
CMake Nightly Date Stamp
2012-07-20 00:01:05 -04:00
d569f3ef15
Ninja: void function can't return a value
2012-07-19 07:32:03 +02:00
b320008658
CMake Nightly Date Stamp
2012-07-19 00:01:07 -04:00
52160bf68f
Ninja: enable ninja on Mac so all Mac CDash-builds are tested, cleanup later
2012-07-18 21:37:24 +02:00
b21cb9ff74
Tests/ObjC++: Use standard <iostream> header
...
Drop use of non-standard <iostream.h> header.
2012-07-18 10:03:59 -04:00
7fa8e532b6
Tests/X11: Add missing include <stdlib.h> for 'rand'
2012-07-18 09:59:15 -04:00
56aeac6e64
Ninja: fixes for bcc
2012-07-18 13:39:14 +02:00
7a6bc9e987
Ninja: remove 'this' from member initializer list
2012-07-18 13:11:27 +02:00
9e30289176
Ninja: Cannot pass a reference to an anonymous object.
2012-07-18 12:35:10 +02:00
44ba4cfdb6
Ninja: remove warnings
2012-07-18 12:17:39 +02:00
7751966297
Ninja: remove 'friend' in ninja code
2012-07-18 11:27:49 +02:00
207ec5c3b1
Ninja: fix mis-matching endif() argument
2012-07-18 09:51:43 +02:00
79a4e2bbdd
Fixed: FindLAPACK does not find MKL 10.3 when using gcc 4.x
2012-07-18 11:17:45 +04:00
6b6c2e0b5c
CMake Nightly Date Stamp
2012-07-18 00:01:04 -04:00
74d1c88529
Ninja: cmcldeps needs absolute paths for RCs
2012-07-17 18:54:56 +02:00
873f21ad1b
pre-commit: Reject C++ code with lines too long
...
Check changes in Source/*.h and Source/*.cxx for lines longer than
our style limit.
2012-07-17 08:16:12 -04:00
c3988ee871
Re-factor OS X content generator start up.
2012-07-17 14:03:12 +02:00
f8e0a5109f
Re-factor framework directory computation.
2012-07-17 14:03:11 +02:00
f36c7b0bbe
Re-factor Mac OS X content directory computation.
2012-07-17 14:03:11 +02:00
5d885db416
Re-factor bundle content copying rules generation.
2012-07-17 14:03:10 +02:00
3b2a01e80e
Ninja: Use same echo message as makefiles.
2012-07-17 14:03:10 +02:00
7bb56c511e
Re-factor CFBundle generation.
2012-07-17 14:03:09 +02:00
03bdaf5453
Enable BundleTest with CLang too.
2012-07-17 14:03:09 +02:00
54d9713adb
Ninja: Add support for CFBundle.
...
This patch fixes test CFBundleTest on Darwin.
2012-07-17 14:03:08 +02:00
10686a17f4
Ninja: Copy resource files in the bundle.
...
This patch fixes test BundleTest on Darwin.
2012-07-17 14:03:08 +02:00
a1b803349b
Re-factor OS X bundle and framework generation.
2012-07-17 14:03:07 +02:00
3ba74ad9d5
Remove trailing white-spaces.
2012-07-17 14:03:06 +02:00
aff0029ee3
Ensure 3rd party libraries are writable.
...
This patch fixes CMake.Install when Qt4 is installed read-only by packaging
system like Homebrew.
2012-07-17 14:03:05 +02:00
a7b4e3a57b
Ninja: Add support for OX X library framework.
...
This patch fixes test ExportImport on Darwin.
2012-07-17 14:03:05 +02:00
21f156c03b
Ninja: Add support for OS X app bundles.
...
This patch fixes test Qt4Deploy on Darwin.
Thanks to Jamie Kirkpatrick <jkp@kirkconsulting.co.uk>
2012-07-17 14:03:04 +02:00
0a3d6a19b7
Ninja: make debug symbol suffix configurable by CMAKE_DEBUG_SYMBOL_SUFFIX
2012-07-17 11:45:19 +02:00
75bbffbe1b
Ninja: make TARGET_PDB a real .gdb file name
2012-07-17 11:21:03 +02:00
cdfa14a4f5
CMake Nightly Date Stamp
2012-07-17 00:01:05 -04:00
e5a27a44a7
Ninja: line length
2012-07-16 18:16:01 +02:00
c864103748
Ninja: path is already declared
2012-07-16 17:09:10 +02:00
1cdeef795a
Ninja: readd quotes to src file path before patching it
2012-07-16 16:48:32 +02:00
ae8124a04c
Ninja: also mingw needs TARGET_PDB
2012-07-16 15:03:38 +02:00
f478b52cd0
CMake Nightly Date Stamp
2012-07-16 00:01:04 -04:00
6547f369e4
Ninja: more searching for windres
...
search for windres with and without prefix,
and also when only CXX compiler is set.
2012-07-15 19:59:37 +02:00
78588e0343
Ninja: there could be null pointers
2012-07-15 18:48:31 +02:00
84a18cb5d6
Ninja: also stop when .rc's .d file couldn't be generated
...
prevents silent disappearing of .d files for resource files.
cmcldeps changes directory for cl call, so relativ include paths do not work.
2012-07-15 18:23:04 +02:00
0c89c10cfc
Ninja: search for windres with prefix
2012-07-15 16:04:26 +02:00
Brad King
David Cole
Bill Hoffman
Peter Kümmel
Kitware Robot
Nicolas Despres
Alexey Ozeritsky