summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'directory-typo'David Cole2012-08-135-6/+6
|\ | | | | | | | | 6c8722f Fix typo direcotry -> directory (and similar) [#13444]
| * Fix typo direcotry -> directory (and similar) [#13444]Rolf Eike Beer2012-07-305-6/+6
| |
* | Merge topic 'SelectLibraryConfiguration-multi-lib-per-var2'David Cole2012-08-131-8/+10
|\ \ | | | | | | | | | | | | 5797512 SelectLibraryConfiguration: generate correct output when input vars are lists
| * | SelectLibraryConfiguration: generate correct output when input vars are listsRolf Eike Beer2012-07-291-8/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In case that any of the input variables that hold the library names contains more than just a single library the "debug" or "optimized" keywords were only prepended to the first item, making all other libs appear in all configurations. Just treat both input variables as lists. Thanks to Philipp Berger <newsletters@philippberger.de> for pointing me at this.
* | | Merge topic 'FindOpenSSL-improve'David Cole2012-08-131-35/+43
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3cfb68d FindOpenSSL: remove leftover comment fc798ed FindOpenSSL: cleanup path hints c78a7d1 FindOpenSSL: let CMake handle environment variable HINTS 7464519 FindOpenSSL: use SelectLibraryConfigurations 4b793ad FindOpenSSL: find cross-compiled OpenSSL from MinGW (#13431)
| * | | FindOpenSSL: remove leftover commentRolf Eike Beer2012-07-291-1/+0
| | | |
| * | | FindOpenSSL: cleanup path hintsRolf Eike Beer2012-07-291-19/+28
| | | | | | | | | | | | | | | | | | | | | | | | -only use Windows-specific paths on Windows -recode the contents of $ENV{PROGRAMFILES} to be a valid CMake path before using it
| * | | FindOpenSSL: let CMake handle environment variable HINTSRolf Eike Beer2012-07-291-1/+1
| | | | | | | | | | | | | | | | This will automatically make sure the paths will get recoded to proper separators on Windows
| * | | FindOpenSSL: use SelectLibraryConfigurationsRolf Eike Beer2012-07-291-13/+5
| | | |
| * | | FindOpenSSL: find cross-compiled OpenSSL from MinGW (#13431)Rolf Eike Beer2012-07-291-2/+10
| |/ / | | | | | | | | | Suggested-by: Dominik Schmidt <dev@dominik-schmidt.de>
* | | Merge topic 'EclipseFixBadLinkedResources'David Cole2012-08-131-0/+14
|\ \ \ | | | | | | | | | | | | | | | | 4ea5dc5 Eclipse: fix #13358: don't create bad linked resources
| * | | Eclipse: fix #13358: don't create bad linked resourcesAlex Neundorf2012-07-281-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't create linked resources which point to CMAKE_BINARY_DIR itself or one of its parent dirs. Eclipse complained about that. Alex
* | | | Merge topic 'EclipseAddSupportForJuno'David Cole2012-08-131-1/+7
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | 53cc102 Eclipse: improve (fix ?) version detection on OSX bcccddc Eclipse: add support for the 4.2 Juno release (#13367)
| * | | | Eclipse: improve (fix ?) version detection on OSXAlex Neundorf2012-07-281-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is probably related to a framework installation I guess. This is part of the patch in #13367 from Nicholas Yue. Alex
| * | | | Eclipse: add support for the 4.2 Juno release (#13367)Alex Neundorf2012-07-281-1/+4
| |/ / / | | | | | | | | | | | | | | | | | | | | Thanks for the path to Nicholas Yue. Alex
* | | | Merge topic 'mixed-lib-to-lib64'David Cole2012-08-1318-80/+112
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | af80da3 remove lib64 Unix paths if the respective lib path is also given 733726e find_library: Fix mixed lib->lib64 (non-)conversion cases (#13419) 54add62 find_library: Simplify lib->lib<arch> expansion 6ca2f82 find_library: Refactor lib->lib64 conversion 1fe4b82 find_library: Add test covering lib->lib64 cases
| * | | | remove lib64 Unix paths if the respective lib path is also givenRolf Eike Beer2012-07-213-6/+4
| | | | | | | | | | | | | | | | | | | | If FIND_LIBRARY_USE_LIB64_PATHS is set both will be searched anyway.
| * | | | find_library: Fix mixed lib->lib64 (non-)conversion cases (#13419)Brad King2012-07-203-18/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | find_library: Simplify lib->lib<arch> expansionBrad King2012-07-201-17/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Simplify cmFindLibraryCommand::AddArchitecturePaths logic to avoid recording a separate 'found' status and populating an entire vector<string> just to throw it away.
| * | | | find_library: Refactor lib->lib64 conversionBrad King2012-07-202-49/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | find_library: Add test covering lib->lib64 casesBrad King2012-07-2013-0/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | Merge topic 'use_normal_ouput_with_chdir'David Cole2012-08-131-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 4ddd3b9 Use OUTPUT_NORMAL instead of OUTPUT_MERGE for cmake -E chdir.
| * | | | | Use OUTPUT_NORMAL instead of OUTPUT_MERGE for cmake -E chdir.Bill Hoffman2012-07-201-1/+1
| |/ / / / | | | | | | | | | | | | | | | Using OUTPUT_MERGE can cause the output to be jumbled in some cases.
* | | | | Merge topic 'release-script-fixes'David Cole2012-08-131-3/+13
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 214589b Add ability to run as a ctest -S script also
| * | | | | Add ability to run as a ctest -S script alsoDavid Cole2012-06-221-3/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Then, use ctest_sleep to separate uploads by at least one second each, so that the files on the web server all get distinct time stamps. Then, when viewed on the web server, sorted by time, they are also sorted alphabetically.
* | | | | | Merge topic 'exclude-ExternalProject-test-for-cygwin-release-script'David Cole2012-08-132-1/+9
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3a17311 Release: Temporarily exclude ExternalProject test on cygwin
| * | | | | | Release: Temporarily exclude ExternalProject test on cygwinDavid Cole2012-06-222-1/+9
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only temporarily until we can setup a new cygwin build machine for making releases. It's specific to the script that runs on dash2win64 anyhow. When we add a new script to run it on a different machine, and stop building the cygwin releases on dash2win64, this change will naturally no longer apply.
* | | | | | CMake Nightly Date StampKitware Robot2012-08-131-1/+1
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2012-08-121-1/+1
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2012-08-111-1/+1
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2012-08-101-1/+1
| | | | | |
* | | | | | Begin post-2.8.9 developmentDavid Cole2012-08-091-2/+2
| | | | | |
* | | | | | CMake 2.8.9v2.8.9David Cole2012-08-092-1/+5
| | | | | |
* | | | | | Merge branch 'release'David Cole2012-08-092-3/+450
|\ \ \ \ \ \
| * | | | | | CMake 2.8.9-rc3David Cole2012-07-252-1/+66
| | | | | | |
| * | | | | | Merge branch 'release'David Cole2012-07-252-3/+385
| |\ \ \ \ \ \
| | * | | | | | CMake 2.8.9-rc2David Cole2012-07-142-1/+77
| | | | | | | |
| | * | | | | | Merge branch 'release'David Cole2012-07-142-3/+309
| | |\ \ \ \ \ \
| | | * | | | | | CMake 2.8.9-rc1David Cole2012-06-222-3/+309
| | | |/ / / / /
* | | | | | | | CMake Nightly Date StampKitware Robot2012-08-091-1/+1
| | | | | | | |
* | | | | | | | CMake Nightly Date StampKitware Robot2012-08-081-1/+1
| | | | | | | |
* | | | | | | | CMake Nightly Date StampKitware Robot2012-08-071-1/+1
| | | | | | | |
* | | | | | | | CMake Nightly Date StampKitware Robot2012-08-061-1/+1
| | | | | | | |
* | | | | | | | CMake Nightly Date StampKitware Robot2012-08-051-1/+1
| | | | | | | |
* | | | | | | | CMake Nightly Date StampKitware Robot2012-08-041-1/+1
| | | | | | | |
* | | | | | | | CMake Nightly Date StampKitware Robot2012-08-031-1/+1
| | | | | | | |
* | | | | | | | CMake Nightly Date StampKitware Robot2012-08-021-1/+1
| | | | | | | |
* | | | | | | | CMake Nightly Date StampKitware Robot2012-08-011-1/+1
| | | | | | | |
* | | | | | | | CMake Nightly Date StampKitware Robot2012-07-311-1/+1
| |_|_|_|_|_|/ |/| | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2012-07-301-1/+1
| |_|_|_|_|/ |/| | | | |