summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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.
* find_library: Generalize helper macro in test caseBrad King2012-09-251-18/+18
| | | | | | In Tests/CMakeOnly/find_library/CMakeLists.txt generalize the test_find_library macro and move the lib64 substitution logic to a new test_find_library_subst macro.
* find_library: Simplify framework search logicBrad King2012-09-251-9/+12
| | | | | | In cmFindLibraryCommand::FindFrameworkLibrary drop use of the old SystemTools::FindDirectory method. Replace it with a direct implementation of the only code path we used.
* find_library: Refactor internal name iterationBrad King2012-09-251-37/+55
| | | | | | Teach cmFindLibraryHelper to support multiple possible names and iterate over all of them in each CheckDirectory call. For now we still only ever configure one name.
* CMake Nightly Date StampKitware Robot2012-09-201-1/+1
|
* Merge topic 'vs-link-rsp'Brad King2012-09-194-13/+28
|\ | | | | | | | | 5598d9b Ninja: don't expand any rsp files
| * Ninja: don't expand any rsp filesPeter Kuemmel2012-09-194-13/+28
| |
* | Merge topic 'ExternalProject-DOWNLOAD_NAME'Brad King2012-09-191-1/+5
|\ \ | | | | | | | | | | | | 8da0fe4 ExternalProject: Add DOWNLOAD_NAME option
| * | ExternalProject: Add DOWNLOAD_NAME optionBrad King2012-09-181-1/+5
| | | | | | | | | | | | | | | | | | | | | Some download URLs do not have the filename embedded in the url. Add an interface to specify the local filename explicitly. Suggested-by: James Goppert <james.goppert@gmail.com>
* | | Merge topic 'file-DOWNLOAD-user-agent'Brad King2012-09-191-0/+3
|\ \ \ | | | | | | | | | | | | | | | | 14aff4d file(DOWNLOAD): Add HTTP User-Agent string
| * | | file(DOWNLOAD): Add HTTP User-Agent stringBrad King2012-09-181-0/+3
| |/ / | | | | | | | | | | | | | | | | | | Some servers require a User-Agent string. The curl command-line tool just sends "curl/$curlver", so do the same. Suggested-by: Fredrik Ehnbom <fehnbom@nvidia.com>
* | | Merge topic 'vs11-express'Brad King2012-09-195-9/+16
|\ \ \ | | | | | | | | | | | | | | | | | | | | 7ee3cee VS11: Add VS 2012 Express support (#13348) e17f345 VS11: Detect VS 2012 Express for default generator (#13348)
| * | | VS11: Add VS 2012 Express support (#13348)Brad King2012-09-184-7/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the registry entries that vsvars32.bat uses to detect the location of MSBuild.exe in the framework directory. Invoke MSBuild with the option /p:VisualStudioVersion=$version so it knows from which VS version to load the system build rules. Teach cmGlobalVisualStudio11Generator to set its ExpressEdition member using the registry.
| * | | VS11: Detect VS 2012 Express for default generator (#13348)Brad King2012-09-181-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add WDExpress to the list of registry search locations. Add VS 11 to the list of VS versions and corresponding generator names. Fix the search logic to use the most recent version found under any registry entry. Inspired-by: Peter Kümmel <syntheticpp@gmx.net>
* | | | Merge topic 'ninja-rc-compile-flag'Brad King2012-09-191-5/+35
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | a1c9c13 Ninja: filter target specific compile flags with language specific regex
| * | | | Ninja: filter target specific compile flags with language specific regexPeter Kümmel2012-09-181-5/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sync with Makefile code. Bug: 13486 Many thanks to Nils Gladitz
* | | | | Merge topic 'document-MSVC-variables-12567'Brad King2012-09-191-6/+30
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | f35e35b add documentation for all MSVCxxx version variables (#12567)
| * | | | | add documentation for all MSVCxxx version variables (#12567)Rolf Eike Beer2012-09-181-6/+30
| | | | | |
* | | | | | Merge topic 'osx-clang-target-flags'Brad King2012-09-193-0/+30
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 011d5a4 OS X: Add platform-specific Clang compiler info files (#13536)
| * | | | | | OS X: Add platform-specific Clang compiler info files (#13536)Brad King2012-09-173-0/+30
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clang has the same interface as GNU except that we do not need to test for the deployment target and sysroot flags. Simply set variables CMAKE_${lang}_HAS_ISYSROOT CMAKE_${lang}_OSX_DEPLOYMENT_TARGET_FLAG to true because every version of Clang available on OS X supports these flags.
* | | | | | Merge topic 'generator-expression-refactor'Brad King2012-09-1921-229/+1388
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 91011bd cmGeneratorExpression: Port users to two-stage processing f1eacf0 cmGeneratorExpression: Re-write for multi-stage evaluation
| * | | | | | cmGeneratorExpression: Port users to two-stage processingStephen Kelly2012-09-185-56/+95
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removing the Process() API and removing the parameters from the constructor will allow cmGeneratorExpressions to be cached and evaluated with multiple configs for example, such as when evaluating target properties. This requires the creation of a new compiled representation of cmGeneratorExpression. The cmListFileBacktrace remains in the constructor so that we can record where a particular generator expression appeared in the CMakeLists file.
| * | | | | | cmGeneratorExpression: Re-write for multi-stage evaluationStephen Kelly2012-09-1818-201/+1321
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The expressions may be parsed and then cached and evaluated multiple times. They are evaluated lazily so that literals such as ',' can be treated as universal parameter separators, and can be processed from results without appearing literally, and without interfering with the parsing/evaluation of the entire expression.
* | | | | | | CMake Nightly Date StampKitware Robot2012-09-191-1/+1
| | | | | | |
* | | | | | | Merge topic 'findsdl-unlimited-main-13262'David Cole2012-09-181-3/+5
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | adf7058 FindSDL: add SDLMAIN_LIBRARY only once (#13262)
| * | | | | | | FindSDL: add SDLMAIN_LIBRARY only once (#13262)Rolf Eike Beer2012-09-171-3/+5
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge topic 'cleanup-TLS-and-SSL-interface'David Cole2012-09-183-65/+45
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7369a8f file(DOWNLOAD): Make TLS options behave as documented 131d91a Rename SSL terminology to TLS
| * | | | | | | file(DOWNLOAD): Make TLS options behave as documentedBrad King2012-09-171-33/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The logic added in commit e1c89f08 (file(DOWNLOAD): Add options for SSL, 2012-08-21) did not actually provide the documented behavior. Simplify the implementation to read the variable values first and then replace them with the explicit argument values if encountered. Always set the curl option CURLOPT_SSL_VERIFYPEER to either on or off explicitly instead of depending on the curl default behavior.
| * | | | | | | Rename SSL terminology to TLSBrad King2012-09-143-43/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | TLS has superseded SSL so rename the recently added file(DOWNLOAD) and ExternalProject options using the newer terminology. Drop "CURLOPT" from names because curl is an implementation detail.
* | | | | | | | Merge topic 'ExternalProject-check-hashes'David Cole2012-09-182-50/+77
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c266461 Add SSL_VERIFYPEER and CAINFO file options to ExternalProject_Add. beb8a83 ExternalProject: Generalize URL_MD5 option to URL_HASH
| * | | | | | | Add SSL_VERIFYPEER and CAINFO file options to ExternalProject_Add.Bill Hoffman2012-09-121-2/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit adds the ability to turn on and off ssl certificate authority checking. It also adds the ability to specify a certificate authority information file. This can be done by setting global cmake variables CMAKE_CURLOPT_CAINFO_FILE and or CMAKE_CURLOPT_SSL_VERIFYPEER in the project calling ExternalProject_Add, or by passing those options to individual ExternalProject_Add calls.
| * | | | | | | ExternalProject: Generalize URL_MD5 option to URL_HASHBrad King2012-09-112-50/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for SHA algorithms.
* | | | | | | | Merge topic 'vs-simplify-CreateLocalGenerator'David Cole2012-09-186-42/+0
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f34321a VS: Remove duplicated implementations of CreateLocalGenerator()
| * | | | | | | | VS: Remove duplicated implementations of CreateLocalGenerator()Patrick Gansterer2012-09-146-42/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The IA64 and Win64 versions of the VS8 and VS9 generators contain the same code for this function as in the base class.
* | | | | | | | | Merge topic 'openscenegraph-simplify-fphsa'David Cole2012-09-181-69/+11
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 248db6c FindOpenSceneGraph: simplify by using more features of FPHSA
| * | | | | | | | | FindOpenSceneGraph: simplify by using more features of FPHSARolf Eike Beer2012-09-121-69/+11
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge topic 'if-version-depth'David Cole2012-09-182-6/+17
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dfa0ebd if: Compare up to 8 components in VERSION tests
| * | | | | | | | | if: Compare up to 8 components in VERSION testsBrad King2012-09-112-6/+17
| | |_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extend the number of components tested by if(... VERSION_LESS ...) if(... VERSION_EQUAL ...) if(... VERSION_GREATER ...) from 4 to 8. The latter is a more extreme maximum.
* | | | | | | | | Merge topic 'NewFindGLEWModule'David Cole2012-09-181-0/+30
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fbda7bb Initial version of find module
| * | | | | | | | | Initial version of find moduleBenjamin Eikel2012-09-011-0/+30
| | | | | | | | | |
* | | | | | | | | | Merge topic 'qt5-qtdialog-port'David Cole2012-09-183-99/+117
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 25a4f56 Build with Qt5 if it is found. 717f31a Compile with both Qt4 and Qt5. 066e858 Replace two include_directories with a setting. 430ba9f Use add_subdirectory instead of the obsolete subdirs. 32a5725 Remove an if which is always true. 0b6625c Move variable setting down to where it relates to. 8ab312b Use CMake platform variables instead of Qt ones. bd728f6 Add a return-after-error if an old Qt is found.
| * | | | | | | | | | Build with Qt5 if it is found.Stephen Kelly2012-08-221-6/+23
| | | | | | | | | | |
| * | | | | | | | | | Compile with both Qt4 and Qt5.Stephen Kelly2012-08-211-0/+4
| | | | | | | | | | |
| * | | | | | | | | | Replace two include_directories with a setting.Stephen Kelly2012-08-211-2/+1
| | | | | | | | | | |
| * | | | | | | | | | Use add_subdirectory instead of the obsolete subdirs.Stephen Kelly2012-08-211-1/+1
| | | | | | | | | | |
| * | | | | | | | | | Remove an if which is always true.Stephen Kelly2012-08-211-7/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CMake based CMake build requires version 2.8.2 as of version 2.8.9.
| * | | | | | | | | | Move variable setting down to where it relates to.Stephen Kelly2012-08-211-1/+1
| | | | | | | | | | |
| * | | | | | | | | | Use CMake platform variables instead of Qt ones.Stephen Kelly2012-08-211-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Qt ones no longer exist in Qt 5.
| * | | | | | | | | | Add a return-after-error if an old Qt is found.Stephen Kelly2012-08-211-94/+93
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | No need for an else after a return.
* | | | | | | | | | | Merge topic 'topics/FindCUDA/Add-CUDA_HOST_COMPILER'David Cole2012-09-182-7/+27
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | db207e4 FindCUDA: Added CUDA_HOST_COMPILER variable.