summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Squish: use ${CMAKE_CURRENT_LIST_DIR}Alex Neundorf2012-11-051-1/+2
| | | | | | Use ${CMAKE_CURRENT_LIST_DIR} instead of constructing the dir from pieces. Alex
* Squish: rename squish_add_test() to squish_v3_add_test() and fix docs a bitAlex Neundorf2012-11-051-4/+14
| | | | | | | | | | There is still a wrapper macro squish_add_test(), but this now mentions that you should use squish_v3_add_test() instead. Also, the docs for the macro were just wrong. They are at least correct now, but still hard to understand (I don't have squish 3 around, so I can't improve them). Alex
* Squish: find executables also under WindowsAlex Neundorf2012-11-041-2/+2
| | | | | | | This is required according to Volker Krause (see http://public.kitware.com/Bug/view.php?id=9734) Alex
* Squish: use FPHSAAlex Neundorf2012-11-041-6/+4
| | | | Alex
* Squish: detect versionAlex Neundorf2012-11-041-0/+19
| | | | Alex
* CMake Nightly Date StampKitware Robot2012-11-041-1/+1
|
* CMake Nightly Date StampKitware Robot2012-11-031-1/+1
|
* CMake Nightly Date StampKitware Robot2012-11-021-1/+1
|
* CMake Nightly Date StampKitware Robot2012-11-011-1/+1
|
* Merge topic 'doc-external-language-policy'David Cole2012-10-311-0/+16
|\ | | | | | | | | 854369f Document external language support policy
| * Document external language support policyBrad King2012-10-301-0/+16
| | | | | | | | | | Describe in "Modules/CMakeAddNewLanguage.txt" our policy for external language support.
* | Merge topic 'parisc-default-flags'David Cole2012-10-312-0/+27
|\ \ | | | | | | | | | | | | e496c54 Linux/PA-RISC: Link with --unique=.text.* to help binutils
| * | Linux/PA-RISC: Link with --unique=.text.* to help binutilsRolf Eike Beer2012-10-312-0/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is a binutils bug that leads to errors like this: /usr/lib/gcc/hppa2.0-unknown-linux-gnu/4.6.3/../../../../hppa2.0-unknown-linux-gnu/bin/ld: libCMakeLib.a(cmTarget.cxx.o)(.text+0x12084): cannot reach 00001d28__ZNSspLEPKc@@GLIBCXX_3.4+0, recompile with -ffunction-sections /usr/lib/gcc/hppa2.0-unknown-linux-gnu/4.6.3/../../../../hppa2.0-unknown-linux-gnu/bin/ld: libCMakeLib.a(cmTarget.cxx.o)(.text+0x12084): cannot handle R_PARISC_PCREL17F for std::basic_string<char, std::char_traits<char>, std::allocator<char> >::operator+=(char const*)@@GLIBCXX_3.4 /usr/lib/gcc/hppa2.0-unknown-linux-gnu/4.6.3/../../../../hppa2.0-unknown-linux-gnu/bin/ld: final link failed: Bad value Until someone finds out what needs to be fixed in binutils this allows anyone to compile a working CMake even in debug mode.
* | | Merge topic 'packagemaker-component-postflight'David Cole2012-10-313-36/+97
|\ \ \ | | | | | | | | | | | | | | | | 4374441 PackageMaker: Enable postflight script in component mode (#12375)
| * | | PackageMaker: Enable postflight script in component mode (#12375)Clinton Stimpson2012-10-313-36/+97
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, setting CPACK_POSTFLIGHT_SCRIPT had no effect in component mode, when CPACK_COMPONENTS_ALL was set. In component mode, a .mpkg is created that contains multiple .pkg's. Because postflight scripts only work in a .pkg, add another .pkg to the .mpkg and put the postflight script in that. This is the same approach taken by the PackageMaker GUI when adding a postflight script to a metapackage.
* | | | Merge topic 'vs10-DelaySign-KeyFile'David Cole2012-10-315-84/+96
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | 035e7bd VS10: Honor /DELAYSIGN and /KEYFILE flags (#13601) c65a2ea VS10: Refactor link options collection
| * | | | VS10: Honor /DELAYSIGN and /KEYFILE flags (#13601)Brad King2012-10-262-3/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix the VS 10 link flag map to name the project file entries correctly. The VS 11 link flag map already has the correct names. Generate the entries in the <PropertyGroup> along with incremental linking options. Drop them from the <Link> element because VS does not use them.
| * | | | VS10: Refactor link options collectionBrad King2012-10-264-81/+76
| | |_|/ | |/| | | | | | | | | | | | | | | | | | Avoid collecting the link options twice. Collect them once in a LinkOptions member and use it from both places. We already do this for compiler options with the ClOptions member.
* | | | Merge topic 'update-KWIML'David Cole2012-10-311-0/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | 0e3f95e Merge branch 'upstream-kwiml' into update-KWIML 4156235 KWIML: Teach ABI.h that VAX is big endian
| * \ \ \ Merge branch 'upstream-kwiml' into update-KWIMLBrad King2012-10-251-0/+4
| |\ \ \ \
| | * | | | KWIML: Teach ABI.h that VAX is big endianThomas Klausner2012-10-251-0/+4
| | | | | |
* | | | | | Merge topic 'test-major-version'David Cole2012-10-313-1/+69
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | d1f3bfe Tests: add MajorVersionSelection tests
| * | | | | | Tests: add MajorVersionSelection testsRolf Eike Beer2012-10-313-1/+69
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For things where we may have 2 major versions of the same software installed in parallel (think of Qt and Python) make sure our version selection gets this right.
* | | | | | Merge topic 'FindQt-version-selection'David Cole2012-10-311-4/+8
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 041fb29 FindQt: add some more places to look for Qt3 7bb9395 FindQt: improve version selection
| * | | | | | FindQt: add some more places to look for Qt3Rolf Eike Beer2012-10-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Qt3 may be e.g. in /usr/lib64/qt-3 or in /usr/lib/qt3, too.
| * | | | | | FindQt: improve version selectionRolf Eike Beer2012-10-241-3/+7
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -make "find_package(Qt 3)" work -if DESIRED_QT_VERSION was set, but only the other Qt major version was found don't override the DESIRED_QT_VERSION set by the user
* | | | | | Merge topic 'xcode-ReRunCMake-full-path'David Cole2012-10-311-2/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 388a321 Xcode: Fix ReRunCMake.make path to cmake.check_cache (#13603)
| * | | | | | Xcode: Fix ReRunCMake.make path to cmake.check_cache (#13603)Brad King2012-10-241-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The path must be either absolute or relative to the working directory from which the makefile will be loaded. In subprojects this is not relative to the top of the build tree. Reported-by: David Weese <tre@gmx.de>
* | | | | | | Merge topic 'cpack-rez-error'David Cole2012-10-311-1/+16
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 14561e3 Fix for possible Rez errors when creating dmg.
| * | | | | | | Fix for possible Rez errors when creating dmg.Clinton Stimpson2012-10-231-1/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rez appears to have a limit on the length of lines it processes. Break up long lines from a license file to avoid the error.
* | | | | | | | Merge topic 'generator-expression-bug-fixes'David Cole2012-10-316-0/+26
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4bacff7 GenEx: Test early determination of AND and OR
| * | | | | | | | GenEx: Test early determination of AND and ORStephen Kelly2012-10-206-0/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It should be possible for example to do this: "$<AND:${FOO},$<BOOL:${TGT}>,$<BOOL:$<TARGET_PROPERTY:${TGT},PROP>" such that it works simliarly to the C code: if (foo && tgt && tgt->prop()) { } The example of generator expression code is a little bit contrived as it could be written other ways with the same functionality. Nevertheless, as these cases already work and are intentional, test for them.
* | | | | | | | | Merge topic 'EclipseNoLinkedResources'David Cole2012-10-313-0/+16
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fbda958 Eclipse: add switch to disable linked resources (#13189)
| * | | | | | | | | Eclipse: add switch to disable linked resources (#13189)Alex Neundorf2012-10-173-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Eclipse may get confused by these linked resources, because it sees the same source file multiple times then and doesn't recognize that it's the same file actually. Alex
* | | | | | | | | | Merge topic 'fix-9629-add-unicode-nsis-reg-key'David Cole2012-10-311-7/+19
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 668dda0 CPack: Add automatic detection of the Unicode makensis (#9629)
| * | | | | | | | | | CPack: Add automatic detection of the Unicode makensis (#9629)David Cole2012-10-171-7/+19
| | | | | | | | | | |
* | | | | | | | | | | Merge topic 'FindIcotool'David Cole2012-10-312-2/+59
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 86a184d Add module FindIcotool
| * | | | | | | | | | | Add module FindIcotoolAleksey Avdeev2012-10-162-2/+59
| |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This module looks for icotool. Signed-off-by: Aleksey Avdeev <solo@altlinux.ru>
* | | | | | | | | | | Merge topic 'simplify-FreeBSD-shared'David Cole2012-10-312-26/+22
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6f68ef4 BSD: Do not require dlfcn.h to build shared libs (#13573)
| * | | | | | | | | | | BSD: Do not require dlfcn.h to build shared libs (#13573)Brad King2012-10-052-26/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove ancient checks left from commit f5d95fb0 (Complete rework of makefile generators expect trouble, 2002-11-08). Modern FreeBSD and NetBSD platforms support shared libraries. When cross-compiling the /usr/include/dlfcn.h may not exist on the host but the toolchain still supports shared libraries.
* | | | | | | | | | | | Merge topic 'FindBoost-cleanup'David Cole2012-10-311-813/+748
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0496782 FindBoost: Rewrite documentation 4d92f6c FindBoost: Refactor Boost_FOUND computation and version check 0100f88 FindBoost: Construct a clean Boost_LIBRARIES value 5b9149e FindBoost: Overhaul caching and search repeat behavior 5ec8a69 FindBoost: Use PATH_SUFFIXES to look in "Program Files" d3260a4 FindBoost: Mark Boost_DIR cache entry as advanced 531612d FindBoost: Remove extra indentation level
| * | | | | | | | | | | | FindBoost: Rewrite documentationBrad King2012-09-271-242/+135
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Write new documentation for this module. Ensure that it formats correctly in "cmake --help-module FindBoost" output. Show the basic form of calling find_package(Boost). Document all result variables, input variables, and cache variables appropriately grouped together. Explain the search process and how it re-runs when changes are made. Explain the difference between finding headers/libraries versus finding a "Boost CMake" package configuraiton file. Drop the emphasis on Boost_ADDITIONAL_VERSIONS because the implementation should predict most future versions instead.
| * | | | | | | | | | | | FindBoost: Refactor Boost_FOUND computation and version checkBrad King2012-09-271-98/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Construct an initial Boost_FOUND value immediately after searching for Boost_INCLUDE_DIR. Base the result only on whether header files for the requested version were found. Then after searching for component libraries update Boost_FOUND based on whether all requested components were found.
| * | | | | | | | | | | | FindBoost: Construct a clean Boost_LIBRARIES valueBrad King2012-09-271-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Construct the value from scratch based on the component library list. Avoid accumulating values from repeated find_package(Boost) calls. If Boost is not found, Boost_LIBRARIES should be empty.
| * | | | | | | | | | | | FindBoost: Overhaul caching and search repeat behaviorBrad King2012-09-271-128/+208
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Overhaul the implementation as follows: (1) Do not cache result variables such as Boost_VERSION, Boost_LIB_VERSION, Boost_LIBRARY_DIRS, Boost_${COMPONENT}_FOUND, Boost_${COMPONENT}_LIBRARY, or Boost_LIB_DIAGNOSTIC_DEFINITIONS that are derived uniquely from other search results. The user should not edit them anyway. (2) Add cache value Boost_LIBRARY_DIR to hold the single directory expected to contain all libraries. Once one library is found, search only that directory for other libraries. (3) Use the find_library NAMES_PER_DIR option to consider all possible library names at the same time. (4) Collect all documented input and cache variables and detect when they have been changed by the user. Discard prior search results that may have been influenced by the changes and search for them again. Environment variables are not expected to be persistent so use them only as hints and do not consider changes to them to be meaningful.
| * | | | | | | | | | | | FindBoost: Use PATH_SUFFIXES to look in "Program Files"Brad King2012-09-271-8/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The CMake find_path command looks under the proper "Program Files" directories on Windows with any of the provided PATH_SUFFIXES. This is simpler and more robust than directly reading ENV{ProgramFiles}. Once Boost_INCLUDE_DIR has been located we already look next to it for the lib directory anyway, so we do not need special help to find Boost libraries under "Program Files".
| * | | | | | | | | | | | FindBoost: Mark Boost_DIR cache entry as advancedBrad King2012-09-261-0/+1
| | | | | | | | | | | | |
| * | | | | | | | | | | | FindBoost: Remove extra indentation levelBrad King2012-09-251-553/+553
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A large portion of the file was still indented for historical reasons.
* | | | | | | | | | | | | Merge topic 'find_library-NAMES_PER_DIR'David Cole2012-10-317-64/+203
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 66759ee find_library: Optionally consider all names in each directory 9cb68b1 find_library: Generalize helper macro in test case b64dd76 find_library: Simplify framework search logic 531c71b find_library: Refactor internal name iteration
| * | | | | | | | | | | | find_library: Optionally consider all names in each directoryBrad King2012-09-257-0/+118
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When more than one value is given to the NAMES option this command by default will consider one name at a time and search every directory for it. Add a NAMES_PER_DIR option to tell this command to consider one directory at a time and search for all names in it.