reactos/CMake
1
0
Fork 0
mirror of https://github.com/reactos/CMake.git synced 2024-11-28 14:01:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
21,853 Commits 4 Branches 185 Tags 113 MiB
ca2c627b39
Commit Graph

21853 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad King
ca2c627b39 Merge topic 'mark_as_advanced' 
8cff5e4 mark_as_advanced: improve documentation syntax
 2013-10-07 15:43:51 -04:00
Brad King
44e5118ede Merge topic 'openssl-advanced' 
864e2a3 FindOpenSSL: mark variables as advanced for MSVC (#14418)
 2013-10-07 15:43:46 -04:00
Brad King
e25dabb3d5 Merge topic 'RunCMake-ignore-valgrind-lines' 
4953330 Tests/RunCMake: Tolerate valgrind lines in CMake output
 2013-10-07 15:43:41 -04:00
Brad King
64064c6616 Merge topic 'cleanup-CTestTestMemcheck' 
e8e67ae CTestTestMemcheck: Fix matching of malloc debug messages
8ea62fd CTestTestMemcheck: Tolerate trailing "==..." lines from valgrind
f169f48 CTestTestMemcheck: Refactor output expectation regex generation
 2013-10-07 15:43:36 -04:00
Brad King
6494cf56dc Merge topic 'fix-genex-preprocessing-incomplete-test' 
2aafacc genex: Test preprocessing incomplete expressions.
 2013-10-07 15:43:29 -04:00
Brad King
2e7ba290a5 Merge topic 'minor_cleanup' 
6931999 VS6: Add some delimiting between error message and content.
d1a5f12 cmTarget: Fix typo in comment.
961c0ba Fix comments to match the code.
7cca50c Remove unused include.
 2013-10-07 15:43:23 -04:00
Brad King
0b7a2034a3 Merge topic 'FixTypoInGraphvizDocs' 
bbb0d6f CMakeGraphVizOptions.cmake: Fix typo in documentation
 2013-10-07 15:43:15 -04:00
Brad King
6955d7bea6 Merge topic 'cmake-gui-window-settings' 
81ea363 cmake-gui: save and restore the geometry and window state between sessions.
 2013-10-07 15:43:09 -04:00
Brad King
7069680bad Merge topic 'FindwxWidgets-msvc-x64' 
870f91e FindwxWidgets: Look in x64 directories for MSVC (#14393)
 2013-10-07 15:42:59 -04:00
Brad King
31e6ee502e Merge topic 'authorative-LINK_LIBRARIES' 
f01dc72 Use one authorative source of the LINK_LIBRARIES property.
 2013-10-07 15:42:55 -04:00
Brad King
ea574d98ed Merge topic 'vs-compiler-id-tolerate-diagnostics' 
8c891f8 VS: Tolerate diagnostic output while detecting cl (#14387)
 2013-10-07 15:42:51 -04:00
Brad King
e0c7ccb1b3 Merge topic 'deprecate-add_compiler_export_flags' 
0f3a666 GenerateExportHeader: Deprecate add_compiler_export_flags function.
 2013-10-07 15:42:41 -04:00
Brad King
1c49ecad36 Merge topic 'FindPython_versions' 
afd4f7f FindPython*: simplify version selection
 2013-10-07 15:42:35 -04:00
Brad King
73170c38d7 Merge topic 'FindLua' 
89cfa20 Modules: add FindLua.cmake
 2013-10-07 15:42:27 -04:00
Brad King
d97fa4b4da Merge topic 'add-find_dependency-macro' 
bb501a2 CMakePackageConfigHelpers: Add a find_dependency macro
 2013-10-07 15:42:22 -04:00
Brad King
5f9de609dd Merge topic 'rename-genex-method' 
cfae430 Genex: Rename cmGeneratorExpression::NeedsParsing to NeedsEvaluation
 2013-10-07 15:42:17 -04:00
Brad King
b61960564a Merge topic 'graphviz-at-generate-time' 
6cf5564 Generate graphviz files at generate time, not configure time.
 2013-10-07 15:42:13 -04:00
Brad King
5a4ec661cf Merge topic 'add-policy-version-test' 
b494722 Tests: Verify policies are introduced only in "official" versions
 2013-10-07 15:42:06 -04:00
Brad King
25b35ed38a Merge topic 'update_trilinos_contract_test' 
5a4a584 update Trilinos contract test
 2013-10-07 15:42:02 -04:00
Brad King
d673e1f38f Merge topic 'fix-style' 
5916645 Fix some indentation problems in cmPolicies.
 2013-10-07 15:41:54 -04:00
Brad King
1e54b380cb Merge topic 'MAP_IMPORTED_CONFIG-property-default' 
fb1294c cmTarget: Add initializer for MAP_IMPORTED_CONFIG_<CONFIG>
 2013-10-07 15:41:49 -04:00
Brad King
a65df441f2 Merge topic 'vs-no-regen-external-msproject' 
e478f03 VS: Fix CMAKE_SUPPRESS_REGENERATION bad ZERO_CHECK dependency (#14378)
 2013-10-07 15:41:44 -04:00
Brad King
058af7a6ce Merge topic 'PLATFORM_ID-genex' 
dcc00ec Genex: Add the PLATFORM_ID expression.
 2013-10-07 15:41:39 -04:00
Brad King
ea3bb7ed9a Merge topic 'automoc-gadget' 
d4937da Search for the Q_GADGET macro for running automoc too.
 2013-10-07 15:41:33 -04:00
Brad King
f4acef500b Merge topic 'ADDITIONAL_MAKE_CLEAN_FILES-genex' 
d26594f Genex: Evaluate genexes for additional make clean files.
 2013-10-07 15:41:29 -04:00
Brad King
f7558c5447 Merge topic 'fix-reset-compiler' 
8b2a2db Fix resetting the compiler on the command line (#14366).
 2013-10-07 15:41:24 -04:00
Brad King
610234a5e8 Merge topic 'FortranCInterface-cross-compile' 
d7a65a2 FortranCInterface: Fix cross-compiling Linux to MinGW (#14358)
 2013-10-07 15:41:19 -04:00
Brad King
0f32faafdb Merge topic 'remove-local-typedef' 
2a7fecc remove unused local typedef
 2013-10-07 15:41:12 -04:00
Brad King
7f5961f935 Merge topic 'no-duplicate-find-tests' 
796c618 blacklist tests with their own test in Tests/Module from AllFindModules test
 2013-10-07 15:41:06 -04:00
Brad King
d4134352ab Begin post-2.8.12 development 2013-10-07 15:24:20 -04:00
Brad King
ffff99c58e CMake 2.8.12 2013-10-07 08:28:26 -04:00
Brad King
431eaf3783 Merge branch 'release' 2013-10-07 08:26:01 -04:00
Brad King
c515dc5748 Merge topic 'fix-install-include-dirs-processing' 
6f98f4a Genex: Fix processing multiple include directories for relative paths
 2013-10-07 08:26:46 -04:00
Stephen Kelly
6f98f4ac92 Genex: Fix processing multiple include directories for relative paths 
Re-insert the semicolon which was removed during splitting.

Commit d777b8e7 (Genex: Allow relative paths in INSTALL_INTERFACE.,
2013-07-25) introduced the prefixItems method to allow relative paths
in the argument of the INSTALL_INTERFACE expression. That method was
buggy in that it did not re-introduce the semicolon separator in
the result.

This bug also affects paths which are already absolute in user code.
 2013-10-07 08:17:12 -04:00
Kitware Robot
d85b06602a CMake Nightly Date Stamp 2013-10-07 00:01:10 -04:00
Kitware Robot
5b98d09e80 CMake Nightly Date Stamp 2013-10-06 00:01:10 -04:00
Kitware Robot
dc92741d03 CMake Nightly Date Stamp 2013-10-05 00:01:06 -04:00
Kitware Robot
e20edcdb3d CMake Nightly Date Stamp 2013-10-04 00:01:07 -04:00
Brad King
e27523a834 Merge topic 'xcode-5' 
a3194ff Xcode: Fix OBJECT library support for Xcode 5 (#14254)
dff8d11 Xcode: Drop XCODE_DEPEND_HELPER for Xcode >= 5
1180322 Xcode: Teach Tests/BuildDepends to allow LINK_DEPENDS_NO_SHARED failure
765b46d Xcode: Fix test architecture selection for Xcode >= 5
 2013-10-03 08:17:43 -04:00
Kitware Robot
a9a48ff9f4 CMake Nightly Date Stamp 2013-10-03 00:01:05 -04:00
Brad King
a3194ff4a7 Xcode: Fix OBJECT library support for Xcode 5 (#14254) 
Xcode 2.1 through 4 supported $(CURRENT_ARCH) in a PBXFileReference
'path' value used in the "Link Binary with Libraries" build phase.
CMake uses this to reference object file locations on link lines to
bring in OBJECT library content.  However, Xcode 5 now evaluates the
$(CURRENT_ARCH) reference in this context as "undefined_arch" so the
wrong path is given to the linker.  There seems to be no alternative way
to produce an architecture-specific value in a PBXFileReference.

Fortunately Xcode 5 now also handles link dependencies for paths linked
through OTHER_LDFLAGS.  For Xcode >= 5, move the OBJECT library object
file references from the link build phase to OTHER_LDFLAGS.  We can
still show the object files in the source group listing in either case.
 2013-10-02 13:03:21 -04:00
Brad King
dff8d113b4 Xcode: Drop XCODE_DEPEND_HELPER for Xcode >= 5 
Xcode 5.0 now computes dependencies from files linked through
OTHER_LDFLAGS, so we no longer need the XCODE_DEPEND_HELPER hack to
re-link dependents when targets change.
 2013-10-02 12:49:09 -04:00
Brad King
118032247c Xcode: Teach Tests/BuildDepends to allow LINK_DEPENDS_NO_SHARED failure 
Xcode 5.0 now relinks targets when their shared libraries dependencies
are modified, and there seems to be no way to stop it.  Report this as a
known limitation in the test output and do not fail.
 2013-10-02 12:49:09 -04:00
Brad King
765b46d1e1 Xcode: Fix test architecture selection for Xcode >= 5 
In Tests/Architecture and Tests/BuildDepends/Project we select a set of
OS X cpu architectures to use for the test.  Prior to Xcode 4 we always
used i386 and ppc.  Starting with Xcode 4, the tools do not support ppc
but do support x86_64, so we switch to that.  Fix the version check to
recognize Xcode >= 5 as at least Xcode 4 and use the new architectures.
 2013-10-02 12:48:20 -04:00
Kitware Robot
c0133a58e8 CMake Nightly Date Stamp 2013-10-02 00:01:07 -04:00
Brad King
c33a38fe22 CMake 2.8.12-rc4 2013-10-01 08:05:44 -04:00
Brad King
cc329e97e0 Merge topic 'osx-find-sdk-frameworks' 
1fce189 OS X: Search system SDKs for frameworks
 2013-10-01 08:05:24 -04:00
Brad King
e02e56c4a6 Merge topic 'fix-duplicate-custom-commands' 
dccd494 Use first custom command for the same output (#14446)
 2013-10-01 08:05:17 -04:00
Brad King
204a54774c Merge branch 'release' 2013-10-01 08:03:41 -04:00
Kitware Robot
fa97f43c81 CMake Nightly Date Stamp 2013-10-01 00:01:06 -04:00