Commit Graph

19505 Commits

Author SHA1 Message Date
David Cole b5d9dba7b6 Merge topic 'ninja-cldeps-check-rc-result'
74d1c88 Ninja: cmcldeps needs absolute paths for RCs
1cdeef7 Ninja: readd quotes to src file path before patching it
84a18cb Ninja: also stop when .rc's .d file couldn't be generated
2012-07-24 17:02:31 -04:00
David Cole e5fce89ea8 Merge topic 'ninja-rspfile-link-libraries'
4259296 Ninja: fix sytle
3799848 Ninja: fix GCC 4.7 warning -Wconversion
2012-07-24 17:02:21 -04:00
David Cole 17cb00e5dc Merge topic 'hooks-line-length'
873f21a pre-commit: Reject C++ code with lines too long
2012-07-24 17:02:09 -04:00
David Cole 2b3a0dbeff Merge topic 'ninja-mingw-windres'
c864103 Ninja: path is already declared
6547f36 Ninja: more searching for windres
78588e0 Ninja: there could be null pointers
0c89c10 Ninja: search for windres with prefix
4654680 Ninja: windres is also used for cross-compiling
2012-07-24 17:01:57 -04:00
Kitware Robot 8a0a918fbb CMake Nightly Date Stamp 2012-07-24 00:01:02 -04:00
Kitware Robot 9c0d0f969f CMake Nightly Date Stamp 2012-07-23 00:01:14 -04:00
Nicolas Despres 1fc8df9ca2 Add missing this->. 2012-07-22 15:36:35 +02:00
Nicolas Despres 7a3ecf5ed5 Fix memory leak in Makefile generator.
This was introduced by 5d885db416.
2012-07-22 15:36:05 +02:00
Kitware Robot e743fc0e17 CMake Nightly Date Stamp 2012-07-22 00:01:05 -04:00
Rolf Eike Beer af80da349b remove lib64 Unix paths if the respective lib path is also given
If FIND_LIBRARY_USE_LIB64_PATHS is set both will be searched anyway.
2012-07-21 10:15:52 +02:00
Kitware Robot d66512122b CMake Nightly Date Stamp 2012-07-21 00:01:08 -04:00
Brad King 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
Brad King 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
Brad King 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
Brad King 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
David Cole b47cffa9b8 CPack: Use bin subdir when looking for dpkg and rpmbuild 2012-07-20 11:53:56 -04:00
Bill Hoffman 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
Peter Kümmel 9f7dc83917 Ninja: also bootstrap ninja files 2012-07-20 11:08:36 +02:00
Peter Kümmel 5d365b26ec Ninja: enable ninja support everywhere 2012-07-20 10:53:34 +02:00
Kitware Robot caeca30936 CMake Nightly Date Stamp 2012-07-20 00:01:05 -04:00
Peter Kümmel d569f3ef15 Ninja: void function can't return a value 2012-07-19 07:32:03 +02:00
Kitware Robot b320008658 CMake Nightly Date Stamp 2012-07-19 00:01:07 -04:00
Peter Kümmel 52160bf68f Ninja: enable ninja on Mac so all Mac CDash-builds are tested, cleanup later 2012-07-18 21:37:24 +02:00
Brad King b21cb9ff74 Tests/ObjC++: Use standard <iostream> header
Drop use of non-standard <iostream.h> header.
2012-07-18 10:03:59 -04:00
Brad King 7fa8e532b6 Tests/X11: Add missing include <stdlib.h> for 'rand' 2012-07-18 09:59:15 -04:00
Peter Kümmel 56aeac6e64 Ninja: fixes for bcc 2012-07-18 13:39:14 +02:00
Peter Kümmel 7a6bc9e987 Ninja: remove 'this' from member initializer list 2012-07-18 13:11:27 +02:00
Nicolas Despres 9e30289176 Ninja: Cannot pass a reference to an anonymous object. 2012-07-18 12:35:10 +02:00
Peter Kümmel 44ba4cfdb6 Ninja: remove warnings 2012-07-18 12:17:39 +02:00
Peter Kümmel 7751966297 Ninja: remove 'friend' in ninja code 2012-07-18 11:27:49 +02:00
Peter Kümmel 207ec5c3b1 Ninja: fix mis-matching endif() argument 2012-07-18 09:51:43 +02:00
Alexey Ozeritsky 79a4e2bbdd Fixed: FindLAPACK does not find MKL 10.3 when using gcc 4.x 2012-07-18 11:17:45 +04:00
Kitware Robot 6b6c2e0b5c CMake Nightly Date Stamp 2012-07-18 00:01:04 -04:00
Peter Kümmel 74d1c88529 Ninja: cmcldeps needs absolute paths for RCs 2012-07-17 18:54:56 +02:00
Brad King 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
Nicolas Despres c3988ee871 Re-factor OS X content generator start up. 2012-07-17 14:03:12 +02:00
Nicolas Despres f8e0a5109f Re-factor framework directory computation. 2012-07-17 14:03:11 +02:00
Nicolas Despres f36c7b0bbe Re-factor Mac OS X content directory computation. 2012-07-17 14:03:11 +02:00
Nicolas Despres 5d885db416 Re-factor bundle content copying rules generation. 2012-07-17 14:03:10 +02:00
Nicolas Despres 3b2a01e80e Ninja: Use same echo message as makefiles. 2012-07-17 14:03:10 +02:00
Nicolas Despres 7bb56c511e Re-factor CFBundle generation. 2012-07-17 14:03:09 +02:00
Nicolas Despres 03bdaf5453 Enable BundleTest with CLang too. 2012-07-17 14:03:09 +02:00
Nicolas Despres 54d9713adb Ninja: Add support for CFBundle.
This patch fixes test CFBundleTest on Darwin.
2012-07-17 14:03:08 +02:00
Nicolas Despres 10686a17f4 Ninja: Copy resource files in the bundle.
This patch fixes test BundleTest on Darwin.
2012-07-17 14:03:08 +02:00
Nicolas Despres a1b803349b Re-factor OS X bundle and framework generation. 2012-07-17 14:03:07 +02:00
Nicolas Despres 3ba74ad9d5 Remove trailing white-spaces. 2012-07-17 14:03:06 +02:00
Nicolas Despres 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
Nicolas Despres a7b4e3a57b Ninja: Add support for OX X library framework.
This patch fixes test ExportImport on Darwin.
2012-07-17 14:03:05 +02:00
Nicolas Despres 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
Peter Kümmel 0a3d6a19b7 Ninja: make debug symbol suffix configurable by CMAKE_DEBUG_SYMBOL_SUFFIX 2012-07-17 11:45:19 +02:00