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

19532 Commits

Author SHA1 Message Date
Peter Kümmel 59cbc28b92 Ninja: prepare msvc pdb cleanup 2012-08-22 12:26:56 +02:00
Kitware Robot c478d55e31 CMake Nightly Date Stamp 2012-08-22 00:01:01 -04:00
Brad King 4c9ae472ec VS11: Rename 'Immersive' to 'WindowsAppContainer' (#12930) 
Since commit 9e01aefd (VS: Add support for WinRT project properties,
2012-02-03) CMake generates for VS 11 projects the 'Immersive' element
for the VS_WINRT_EXTENSIONS target property.  That was based on the VS
11 preview version.  The final version renamed the element to
'WindowsAppContainer', so generate that instead.

Suggested-by: Eugene Golushkov <eugene_gff@ukr.net>
 2012-08-21 13:02:39 -04:00
Stephen Kelly 717f31a877 Compile with both Qt4 and Qt5. 2012-08-21 13:36:51 +02:00
Stephen Kelly 066e85893f Replace two include_directories with a setting. 2012-08-21 13:36:26 +02:00
Stephen Kelly 430ba9faef Use add_subdirectory instead of the obsolete subdirs. 2012-08-21 13:36:26 +02:00
Stephen Kelly 32a572564a Remove an if which is always true. 
CMake based CMake build requires version 2.8.2 as of version 2.8.9.
 2012-08-21 13:36:26 +02:00
Stephen Kelly 0b6625c605 Move variable setting down to where it relates to. 2012-08-21 13:36:26 +02:00
Stephen Kelly 8ab312b693 Use CMake platform variables instead of Qt ones. 
The Qt ones no longer exist in Qt 5.
 2012-08-21 13:36:21 +02:00
Stephen Kelly bd728f6fee Add a return-after-error if an old Qt is found. 
No need for an else after a return.
 2012-08-21 11:08:04 +02:00
Stephen Kelly ca7fb14f9b Fix the test setting COMPILE_DEFINITIONS target property 2012-08-21 11:05:07 +02:00
Stephen Kelly 733deb66c6 Fix CompileDefinitions test on Visual Studio. 
Avoid testing unsupported spaces in define values.
 2012-08-21 11:04:09 +02:00
Kitware Robot 8f996a96f4 CMake Nightly Date Stamp 2012-08-21 00:01:02 -04:00
James Bigler 787287cc46 Added CUDA_SOURCE_PROPERTY_FORMAT. Allows setting per file format (OBJ or PTX) 
Added CUDA_SOURCE_PROPERTY_FORMAT that allows users to set the format (OBJ or PTX) on a
per file basis.
 2012-08-20 17:33:35 -06:00
Alex Neundorf 95e502ee7c error out if CTEST_USE_LAUNCHERS is TRUE but RULE_LAUNCH_* are not set 
Otherwise, CTEST_USE_LAUNCHERS can be set to true in a driving ctest
script, and everything looks like it would work and reports 0 build errors,
but actually there can be any amount of errors and they are just not reported.
By adding this check cmake now errors out if CTEST_USE_LAUNCHERS is enabled, but
the RULE properties are not set, which would lead to a not-working ctest run.

Alex
 2012-08-20 23:19:44 +02:00
James Bigler db207e4065 FindCUDA: Added CUDA_HOST_COMPILER variable. 
Added a new CUDA variable for specifying the CUDA_HOST_COMPILER.  This will allow users to
be able to specify which host compiler to use for invoking NVCC with.  By default it will
use the compiler used for host compilation.  This is convenient for when you want to
specify a different compiler than the default compiler.  You end up using the same
compiler for both the NVCC compilation and the host compilation instead of using the
default compiler in the path for NVCC.
 2012-08-20 15:14:37 -06:00
Stephen Kelly c82fbe0c1f Fix unfortunate documentation error for PIC feature. 
The wrong variable is documented, and it is not referred to in
the target-specific property.
 2012-08-20 22:33:27 +02:00
Stephen Kelly 3dae652b4e Don't duplicate -D defines sent to the compiler. 
There is no need to do so. Be consistent with include directories and
ensure uniqueness.

This requires changing the API of the cmLocalGenerator::AppendDefines
method, and changing the generators to match.

The test unfortunately can't test for uniqueness, but it at least verifies
that nothing gets lost.
 2012-08-20 22:30:11 +02:00
Stephen Kelly ee949d8871 Remove duplicate 'of' from docs. 2012-08-20 22:26:05 +02:00
David Cole 32710211ad Merge topic 'qt4_use_modules' 
1420691 Add new qt4_use_modules function.
 2012-08-20 15:42:43 -04:00
David Cole c79dd4d951 Merge topic 'read-less-from-version-headers' 
4be6783 read less from version headers into variables
 2012-08-20 15:42:34 -04:00
David Cole 19e210af90 Merge topic 'no-regex-escape-space' 
637207e do not escape spaces in regular expressions
 2012-08-20 15:42:25 -04:00
David Cole 0afaedfb4a Merge topic 'FindGTK2_12306' 
ad30210 FindGTK2: Add GTK2_CAIROMMCONFIG_INCLUDE_DIR for cairommconfig.h
 2012-08-20 15:42:13 -04:00
David Cole e19f260712 Merge topic 'FindOpenSceneGraph_13094' 
dd60ed2 Merge topic 'lib64-cleanup' into FindOpenSceneGraph_13094
224b5de FindOpenSceneGraph: CMake variable OSG_DIR influences detection now too
 2012-08-20 15:42:03 -04:00
David Cole 9a4b4f2223 Merge topic 'lib64-cleanup' 
cfe4ac4 use PATH_SUFFIXES to simplify find_* calls
b04650e use the find_* functions ENV parameter
 2012-08-20 15:41:53 -04:00
David Cole 4097914bbd Merge topic 'fix-13236-mark-vars-as-advanced' 
3f9fa5c ProcessorCount: Mark find_program vars as advanced (#13236)
 2012-08-20 15:41:44 -04:00
David Cole 8d8268b307 Merge topic 'cmcldeps-needs-cl' 
4a35bd0 Ninja: don't crash on returned 0 pointer
3632f24 Ninja: cmcldeps needs a compiler
 2012-08-20 15:41:36 -04:00
David Cole ba9fde6503 Merge topic 'fix-13315-incorrect-mfc-file-name' 
e4e6ea0 InstallRequiredSystemLibraries: Use correct file names (#13315)
 2012-08-20 15:41:26 -04:00
David Cole e04245e2d5 Merge topic 'HandleMacFrameworkIncludeDirs_13465' 
a3815e6 -fix line length
9110d0e Eclipse on OSX: improve handling of framework include dirs (#13367)
d97b385 Eclipse on OSX: fix handling of framework include dirs (#13464)
 2012-08-20 15:41:14 -04:00
David Cole 407ccb4957 Merge topic 'RemoveNonworkingKDE4Test' 
11f23fe remove non-working KDE4 test
 2012-08-20 15:41:06 -04:00
David Cole 135914f01e Merge topic 'EclipseRemoveLinkedOutputDirectoryResources' 
5271ba5 Eclipse: fix #13358: don't create bad linked resources
 2012-08-20 15:40:56 -04:00
David Cole 690dbc3179 Merge topic 'make-CPACK_CYGWIN_PATCH_NUMBER-cache' 
1fc5efe Convert the CPACK_CYGWIN_PATCH_NUMBER variable to a cache variable
 2012-08-20 15:40:45 -04:00
David Cole 1239b4881d Merge topic 'qt4-path-search' 
35c6ae8 FindQt4: Give precedence to QTDIR environment variable, if set.
5a6a3d4 FindQt4: Give precedence to QTDIR environment variable, if set.
 2012-08-20 15:40:36 -04:00
David Cole 321bbed130 Merge topic 'qt4-version-regex' 
4a772a1 Fix regex for qt minor version.
 2012-08-20 15:40:28 -04:00
David Cole e11e719796 Merge topic 'hg-modules' 
91053cd ExternalProject: Add Mercurial (hg) repository support
ea5bfb1 Add FindHg module to find Mercurial
 2012-08-20 15:40:19 -04:00
David Cole eb6b8c86bf Merge topic 'relwithdebinfo-consistency' 
0ddfc51 Add -DNDEBUG to RelWithDebInfo flags where where Release flags had it.
 2012-08-20 15:40:11 -04:00
David Cole 0075e7e033 Merge topic 'deployqt4-destdir' 
1e3248c DeployQt4:  Include DESTDIR for some cpack generators.
 2012-08-20 15:40:03 -04:00
David Cole c2022eb06d Merge topic 'fphsa-message' 
213a9e5 fphsa: clarify message about minimum required version found.
 2012-08-20 15:39:53 -04:00
David Cole 1b758bcf8e Merge topic 'clarify-if-is_newer_than-docs' 
0eaaa86 CMake: Clarify the documentation for if(f1 IS_NEWER_THAN f2)
 2012-08-20 15:39:45 -04:00
David Cole 9f555e805d Merge topic 'list-command-argument-fixes' 
08c71ac CMake.List test: explicitely test with lists containing only an empty string
52d9c38 list command: error on too many arguments
 2012-08-20 15:39:35 -04:00
David Cole 14c8096ba8 Merge topic 'more-endif-closing-style-cleanups' 
84b49be Remove CMake multiline block-end command arguments
 2012-08-20 15:39:26 -04:00
David Cole d4be75be12 Merge topic 'FindX11-duplicate-includes-13316' 
dd784dd FindX11: avoid calling list(REMOVE_DUPLICATES) on an empty list
97c338b FindX11: remove duplicates from X11 include path list (#13316)
 2012-08-20 15:39:18 -04:00
David Cole b7f3cc22c3 Merge topic 'xcode-asm' 
97140d3 Tests/Assembler: Do not use assembler in universal binaries
f3477ed Xcode: Set ASM source language in project file (#13472)
 2012-08-20 15:39:09 -04:00
David Cole 2582994e57 Merge topic 'clang-asm' 
7e8471c Recognize Clang ASM support (#13473)
 2012-08-20 15:38:51 -04:00
David Cole 3574bb4842 Merge topic 'generator-expression-conditions' 
9d9f616 Add $<CONFIG:...> boolean query generator expression
ebf05ab Add boolean generator expressions
 2012-08-20 15:38:42 -04:00
David Cole 5cf828c028 Merge topic 'CheckTypeSize-doc-10579' 
c6fed68 CheckTypeSize: add a test for size of struct members
48783b7 CheckTypeSize: show in documentation how to get struct member size (#10579)
 2012-08-20 15:38:33 -04:00
David Cole 686eb4e815 Merge topic 'DESTDIR-documentation-enhancement' 
d593cef Enhance DESTDIR documentation. Fixes #0012374.
 2012-08-20 15:38:25 -04:00
David Cole 735bdecd30 Merge topic 'GetPrerequisites-file_cmd-advanced' 
d269984 GetPrerequisites: Mark file_cmd as advanced cache entry
 2012-08-20 15:38:16 -04:00
Alex Neundorf 8aed02ae0f -fix Java dependency scanning, broken in previous commit 
Alex
 2012-08-20 21:37:26 +02:00
Alex Neundorf 7ae4479d65 -fix line length 
Alex
 2012-08-20 21:23:20 +02:00