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

18501 Commits

Author SHA1 Message Date
David Cole f66e735de3 Fix compiler warning reported on older Borland dashboard. 
Avoid assignment inside the if.
 2012-02-22 17:12:11 -05:00
David Cole d90eed445f Fix compiler error reported on older Borland dashboard. 
Declare variable only once at a scope appropriate for both uses.
 2012-02-22 16:40:30 -05:00
David Cole eabc9b0bc5 Ninja: CMake: Adapt Ninja generator for per-target include dirs 
The confluence of the ninja-generator and target-include-directories
branches conspired to produce a nice little compiler error when
they were both merged into 'next'...

Yay for Continuous dashboards!
 2012-02-22 16:31:00 -05:00
David Cole bada88e8e4 Merge branch 'target-include-directories' into ninja-generator 2012-02-22 16:21:48 -05:00
David Cole 8233636dbe Update the documentation regarding INCLUDE_DIRECTORIES. 
It is now a target property and is affected by the use
of the include_directories command.
 2012-02-22 15:22:03 -05:00
Rolf Eike Beer 0110262a2d FindOpenMP: simplify check for enabled languages 2012-02-22 17:47:52 +01:00
Rolf Eike Beer c9c1a17609 FindPythonLibs: get the exact version of the found library (#3080) 2012-02-22 17:20:15 +01:00
Rolf Eike Beer f7723786e7 FindPythonLibs: make the version selection work as for PythonInterp 2012-02-22 17:20:15 +01:00
Rolf Eike Beer bbddaeef7e FindPython{Interp,Libs}: document Python_ADDITIONAL_VERSIONS as input 
The current documentation could be read as if that variable is output from the
module, which is nonsense.
 2012-02-22 17:20:15 +01:00
David Cole d899eb71b5 Call ExpandVariablesInString for each target's INCLUDE_DIRECTORIES 
For strict backwards compatibility only. This should be unnecessary at
this point, but introducing a policy to deprecate it properly is a
whole different topic branch...
 2012-02-22 07:29:32 -05:00
David Cole c21db870a5 Make search paths ordered and unique 
Avoid duplicates. Same as before the introduction of the INCLUDE_DIRECTORIES
target property.
 2012-02-22 07:29:32 -05:00
David Cole 22021f07f8 Remove cmMakefile::GetIncludeDirectories 
After making the changes to use the new target level INCLUDE_DIRECTORIES
property, there are no more callers of this method.
 2012-02-22 07:29:32 -05:00
Stephen Kelly 9106b564ae Extract and use the INCLUDE_DIRECTORIES target properties. 
Eliminate callers of cmMakefile::GetIncludeDirectories.

All callers of GetIncludeDirectories should go through the local generator
object.

Only the local generator calls cmTarget::GetIncludeDirectories directly.
 2012-02-22 06:31:50 -05:00
Stephen Kelly 840509babb Keep the INCLUDE_DIRECTORIES target property up to date. 
The directory level property changes need to be added to it.
 2012-02-22 06:31:50 -05:00
Stephen Kelly a4d5f7b9b2 Add API to get the ordered includes for a target. 2012-02-22 06:31:49 -05:00
David Cole 8adaee2b0b CMake: Eliminate cmMakefile::IncludeDirectories 
Instead, re-implement it in terms of the directory property INCLUDE_DIRECTORIES.
 2012-02-22 06:31:49 -05:00
Stephen Kelly 7620932d82 Remove include flags memoization. 2012-02-22 06:31:49 -05:00
Stephen Kelly 97a5faa858 Make it safe to call this method without creating duplicates. 2012-02-22 06:31:49 -05:00
Stephen Kelly edd5303949 Refactor GetIncludeFlags to take includes instead of fetching them 2012-02-22 06:31:49 -05:00
KWSys Robot 6a1c5a3569 KWSys Nightly Date Stamp 2012-02-22 00:05:07 -05:00
Stephen Kelly 40efa4db74 Fix documented function signature to match reality. 
The function description is already correct.
 2012-02-21 23:54:01 +01:00
David Cole 8ef15df700 Merge topic 'HandleTargetsInCMakeRequiredLibraries' 
35c48e1 Check*.cmake: Expand imported targets in CMAKE_REQUIRED_LIBRARIES
61cb4ea bootstrap: move while() and endwhile() into the bootstrap build
c9f2886 -don't pull in CheckTypeSize.cmake from the cmake which is being built
628f365 -remove trailing whitespace
 2012-02-21 15:58:27 -05:00
David Cole bf6560091d Merge topic 'qt3-find-qtmain' 
f506621 Fix paths/hints for finding qtmain.
 2012-02-21 15:58:06 -05:00
David Cole 0c00c17938 Merge topic 'update-KWIML' 
4cbc21e Merge branch 'upstream-kwiml' into update-KWIML
aabf65a KWIML: Teach ABI.h that MIPS is biendian
 2012-02-21 15:57:41 -05:00
David Cole b187a3a816 Merge topic 'doBuildRPM-withSpaceInTree' 
6749450 Do not build RPM if path of the build tree contains space
 2012-02-21 15:57:30 -05:00
David Cole 7d02020d68 Merge topic 'CPack-dynamicDocSection' 
9a8103e Try to fix compile error on Win32-vs70
4da2223 Fix typo in end markup
cfac874 More documentation concerning CPack Components
dee0a38 Put CPack DMG and PackageMaker doc in separate files
b4abcfe Correct copy/paste section name mistake
9717727 Suppress unecessary (now empty) doc sections
7a8f44a Add structure documentation for CPack Bundle generator
b8a274c Add structured documentation for NSIS
a6bce55 Dynamically add documentation section specified in documented script.
 2012-02-21 15:57:17 -05:00
David Cole 6c6c266439 Merge topic 'GenerateExportHeader_MinorFix' 
54e1f6f GenerateExportHeader: use double quotes around _gcc_version
 2012-02-21 15:57:02 -05:00
David Cole 09c16ca488 Merge topic 'improve-findopenmp' 
6f573ac FindOpenMP: try the most likely flags first
81228e9 FindOpenMP: do not fail if only C or CXX is enabled (#11910)
 2012-02-21 15:56:53 -05:00
David Cole 0b5c086693 Merge topic 'expect-more-versions' 
540db7e AllFindModules test: expect more modules to have a version number available
 2012-02-21 15:56:43 -05:00
David Cole 115d770b33 Merge topic 'improve-findfreetype' 
f58cce0 FindFreetype: support version selection
 2012-02-21 15:56:35 -05:00
David Cole 8a665fa363 Merge topic 'findlibrary-versioned-libraries' 
70f3623 Find_library(): allow searching for versioned shared objects
 2012-02-21 15:56:26 -05:00
David Cole 751e492840 Merge topic 'fix-typos-12975' 
7ec2ebd fix the same typos as found by Debian in other places, too
d36d29f various typo and formatting fixes in manual pages (#12975)
 2012-02-21 15:56:13 -05:00
David Cole 7d4074e1f8 Merge topic 'improve-findpkgconfig' 
2750115 FindPkgConfig: support version selection of pkg-config itself
 2012-02-21 15:56:03 -05:00
David Cole ae61602385 Merge topic 'document-test-layout' 
378f229 Tests: document where to put tests
 2012-02-21 15:55:50 -05:00
David Cole 40d2da09c5 Merge topic 'improve-findlibxslt' 
70697a8 FindLibXslt: support version selection
 2012-02-21 15:55:34 -05:00
David Cole 7023f610d4 Merge topic 'improve-findruby' 
854e762 FindRuby: clean up querying variables from Ruby
 2012-02-21 15:55:26 -05:00
David Cole d39acfa105 Merge topic 'findblas-bugs' 
4585e57 FindBLAS/FindLAPACK: Work with MKL version 10.3 (#12924, #12925)
 2012-02-21 15:55:11 -05:00
David Cole a9f874d826 Merge topic 'suppress-clang-warning' 
f4f94f3 CTestCustom: Suppress clang warning on the dashboard
 2012-02-21 15:55:01 -05:00
David Cole 7bcd282981 Merge topic 'try-compile-random-name' 
4fbdce2 try_compile: Use random executable file name (#12957)
 2012-02-21 15:54:51 -05:00
David Cole ee9fd3d3d3 Merge topic 'FindX11_SearchXxf86vm' 
b295162 fix #6976: FindX11 also searches for X11_Xxf86vm_LIB
 2012-02-21 15:54:40 -05:00
David Cole 1b1eb9740b Merge topic 'fix_fortran_dir_two_dirs' 
087bea3 Allow two cmake_add_fortran_subdirectory calls in the same project.
 2012-02-21 15:54:29 -05:00
David Cole e17f270b7a Merge topic 'improve-findglut' 
14dadbd FindGLUT: honor REQUIRED (#12466)
 2012-02-21 15:54:19 -05:00
David Cole cee42a73e8 Merge topic 'honor-gcov-empty-coverage' 
58d75e2 CTest: mark all gcov covered files as covered
 2012-02-21 15:54:09 -05:00
David Cole d19f68840f Merge topic 'teach_ctest_ninja_errors' 
ffb27ca Teach CTest what a ninja error looks like.
 2012-02-21 15:54:00 -05:00
David Cole d84233a70d Merge topic 'findperllibs-windows' 
10dfec3 FindPerlLibs: properly detect libperl on Windows (#12224)
 2012-02-21 15:53:50 -05:00
David Cole e1a6c9b9a1 Merge topic 'link-OpenBSD-shared-libs-issue-12954' 
afc75bb Recognize OpenBSD versioned .so names (#12954)
 2012-02-21 15:53:41 -05:00
David Cole 27431d2886 Merge topic 'FindGetTextFixMultipleTargets' 
3b48822 FindGetText: fix multiple targets with the same name problem (CMP0002)
 2012-02-21 15:53:31 -05:00
Alex Neundorf 35c48e1270 Check*.cmake: Expand imported targets in CMAKE_REQUIRED_LIBRARIES 
Add the function cmake_expand_imported_targets() to expand imported
targets in a list of libraries into their on-disk file names for a
particular configuration.  Adapt the implementation from KDE's
HANDLE_IMPORTED_TARGETS_IN_CMAKE_REQUIRED_LIBRARIES which has been in
use for over 2 years.  Call the function from all the Check*.cmake
macros to handle imported targets named in CMAKE_REQUIRED_LIBRARIES.

Alex
 2012-02-21 15:38:15 -05:00
Alex Neundorf 61cb4ea72e bootstrap: move while() and endwhile() into the bootstrap build 
Alex
 2012-02-21 15:33:40 -05:00
Alex Neundorf c9f2886b3d -don't pull in CheckTypeSize.cmake from the cmake which is being built 
We can be sure that at least cmake 2.6.3 is used when building cmcurl.
This means we always get in the first branch of the if().
I think it is not a good idea to pull a cmake module from the cmake
which is being built in, since this may use features which are not
supported in the cmake which is used to build cmake (e.g. CMAKE_CURRENT_LIST_DIR
which does not exist in cmake 2.6.3 which is the minimum for cmcurl).

A bit further below there is anyway code to handle the case that cmake is
older than 2.8.0, so it should be ok.

Alex
 2012-02-21 15:33:39 -05:00