summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'improve-findgit'David Cole2012-01-251-1/+16
|\ | | | | | | | | a803a62 FindGit: support version number
| * FindGit: support version numberRolf Eike Beer2012-01-231-1/+16
| |
* | Merge topic 'improve-findgnutls'David Cole2012-01-251-1/+4
|\ \ | | | | | | | | | | | | b5719fb FindGnuTLS: partly support version selection
| * | FindGnuTLS: partly support version selectionRolf Eike Beer2012-01-231-1/+4
| |/ | | | | | | | | For the Un*x systems where we use PkgConfig to find the library we can also use the version returned from there.
* | Merge topic 'improve-libxml2'David Cole2012-01-251-2/+8
|\ \ | | | | | | | | | | | | a5fd391 FindLibXml2: support version selection
| * | FindLibXml2: support version selectionRolf Eike Beer2012-01-231-2/+8
| |/
* | Merge topic 'use-pkgconfig-quiet'David Cole2012-01-254-9/+7
|\ \ | | | | | | | | | | | | ede3ec5 use pkg_check_modules() quiet in other modules
| * | use pkg_check_modules() quiet in other modulesRolf Eike Beer2012-01-234-9/+7
| |/ | | | | | | | | Those modules will already print what they found or not using FPHSA, no need to do this twice.
* | Merge topic 'emacs-mode-indent-issue-12908'David Cole2012-01-251-0/+1
|\ \ | | | | | | | | | | | | 7da35e6 cmake-mode.el: Indent after multiline argument (#12908)
| * | cmake-mode.el: Indent after multiline argument (#12908)Brad King2012-01-231-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After a multiline argument ending in a non-empty line e.g. if(TEST) set(VAR " ...") unset(VAR) endif() we previously failed to indent following lines like the "unset". Use cmake-line-starts-inside-string to keep walking back through multiline arguments until we find an indented line. Suggested-by: Christopher Sean Morrison <brlcad@mac.com>
* | | Merge topic 'uninitialized-var-in-if'David Cole2012-01-253-0/+11
|\ \ \ | | | | | | | | | | | | | | | | 54fd9e3 fix uninitialized var in if(NOT foo bar STREQUAL "foo bar")
| * | | fix uninitialized var in if(NOT foo bar STREQUAL "foo bar")Rolf Eike Beer2012-01-223-0/+11
| | | | | | | | | | | | | | | | Also adds test to verify this.
* | | | Merge topic 'find-threads-11333'David Cole2012-01-251-19/+28
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 3dc6f2b FindThreads: Try pthreads with no special option first (#11333)
| * | | | FindThreads: Try pthreads with no special option first (#11333)Rolf Eike Beer2012-01-211-19/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QNX has the phtread stuff in the standard library. The best way would IMHO be to check if a program that uses pthread_* can be successfully linked without specifying any linker option before trying out the different flags.
* | | | | Merge topic 'GetPrerequisites-rpath-OSX'David Cole2012-01-253-0/+111
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 98d2031 Fix BundleUtilities test failure with space in build path. 36d6641 Fix new BundleUtilities test failure on Mac 10.4.x 0d96dec GetPrerequisites: Add test for @rpath support. 880139a GetPrerequisites: Add support for @rpath on Mac OS X. 9a6b102 GetPrerequisites: Add support for @rpath on Mac OS X.
| * | | | | Fix BundleUtilities test failure with space in build path.Clinton Stimpson2012-01-211-2/+2
| | | | | |
| * | | | | Fix new BundleUtilities test failure on Mac 10.4.xClinton Stimpson2012-01-201-1/+1
| | | | | |
| * | | | | GetPrerequisites: Add test for @rpath support.Clinton Stimpson2012-01-202-0/+82
| | | | | |
| * | | | | GetPrerequisites: Add support for @rpath on Mac OS X.Clinton Stimpson2012-01-201-6/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change to consider a library embedded if it is found in a subdirectory relative to the using executable/library. Previous commit considered them local. This case is encountered when @rpath is used with framework libraries, which are inside a directory tree.
| * | | | | GetPrerequisites: Add support for @rpath on Mac OS X.Clinton Stimpson2011-11-211-3/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Handle @rpath much like other Unixes, by doing a find_file with the given directories. Also, consider a library to be local if it is found in the same directory or a subdirectory relative to the user executable/library. Previously, it was local only if found in the same directory. This case is encountered when @rpath is used with framework libraries, which are inside a directory tree.
* | | | | | Merge topic 'loadcommand-test-cleanup'David Cole2012-01-253-15/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1531c11 LoadCommand test: cleanup
| * | | | | | LoadCommand test: cleanupRolf Eike Beer2012-01-203-15/+0
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | This removes some useless checking. The results of these things are never properly checked so they should not count as testcases. At the end they only needlessly clutter the output.
* | | | | | Merge topic 'FPHSA-CONFIG_MODE-doc'David Cole2012-01-251-3/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 26015ba FindPackageHandleStandardArgs: fix documentation
| * | | | | | FindPackageHandleStandardArgs: fix documentationYury G. Kudryashov2012-01-201-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | State explicitly what CONFIG_MODE argument does.
* | | | | | | Merge topic 'FindPkgConfig-REQUIRED-issue-12620'David Cole2012-01-251-4/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 55c3435 FindPkgConfig: respect REQUIRED (#12620)
| * | | | | | | FindPkgConfig: respect REQUIRED (#12620)Yury G. Kudryashov2012-01-201-4/+2
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | find_package(PkgConfig REQUIRED) now fails if pkg-config is not found.
* | | | | | | Merge topic 'python-version'David Cole2012-01-251-7/+48
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | aa11536 FindPythonInterp: fix version parsing 0fe4d69 FindPythonInterp: make version selectable
| * | | | | | | FindPythonInterp: fix version parsingRolf Eike Beer2012-01-191-5/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On dashmacmini2 the test showed output like this: -- Found PythonInterp: /usr/bin/python (found version "Unknown option: -- usage: /usr/bin/python [option] ... [-c cmd | file | -] [arg] ... Try `python -h' for more information.") On my machine where python outputs "Python 2.7" this worked, but PYTHON_VERSION_MAJOR, PYTHON_VERSION_MINOR, and PYTHON_VERSION_PATCH were all set to "2.7". Add some checks that the version output has the expected form before using it.
| * | | | | | | FindPythonInterp: make version selectableRolf Eike Beer2012-01-181-2/+39
| | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows the developer to tell FindPythonInterp which Python version should be searched for. This allows the right version to be chosen for a project without user assistance if there are specific requirements. This is especially useful as it is common to have major versions 2 and 3 installed in parallel, which are partly incompatible.
* | | | | | | Merge topic 'test_find_modules'David Cole2012-01-252-0/+41
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8d83043 AllFindModules test: also check Qt3 modules if Qt4 is not found e797e7f AllFindModules test: keep complete output ec631d5 add a test that loops through most Find* modules
| * | | | | | | AllFindModules test: also check Qt3 modules if Qt4 is not foundRolf Eike Beer2012-01-181-2/+13
| | | | | | | |
| * | | | | | | AllFindModules test: keep complete outputRolf Eike Beer2012-01-171-0/+3
| | | | | | | |
| * | | | | | | add a test that loops through most Find* modulesRolf Eike Beer2012-01-162-0/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows easy spotting of modules that output crappy messages and the like.
* | | | | | | | Merge topic 'eof-newlines'David Cole2012-01-256-6/+6
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0541a03 GenerateExportHeader test: add newlines before end of file
| * | | | | | | | GenerateExportHeader test: add newlines before end of fileRolf Eike Beer2012-01-176-6/+6
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge topic 'update-dashmacmini2-qt'David Cole2012-01-251-2/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7240aa7 Update dashmacmini2 release script to use Qt 4.6.3
| * | | | | | | | Update dashmacmini2 release script to use Qt 4.6.3David Cole2012-01-171-2/+2
| |/ / / / / / /
* | | | | | | | Merge topic 'install-command-cleanup'David Cole2012-01-252-101/+99
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 982b5d9 cmInstallCommand: Fix line length for style a64b618 cmInstallCommand: Remove duplicated sentence from docs 01ddef8 cmInstallCommand: Fix indentation error
| * | | | | | | | cmInstallCommand: Fix line length for styleBrad King2012-01-171-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After indentation was fixed by a previous commit some lines became too long. Re-wrap to shorten them.
| * | | | | | | | cmInstallCommand: Remove duplicated sentence from docsYury G. Kudryashov2012-01-171-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | install(TARGETS ...) documentation described twice what happens on non-DLL systems.
| * | | | | | | | cmInstallCommand: Fix indentation errorYury G. Kudryashov2012-01-171-98/+98
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A large block of code was indented 2 spaces less than it should.
* | | | | | | | | Merge topic 'openssl-version'David Cole2012-01-251-8/+32
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bb2b264 FindOpenSSL: also parse version number define with uppercase letters 7053a00 FindOpenSSL: only try to parse opensslv.h if it exists 44ba7a3 Merge branch 'master' of git://cmake.org/cmake into openssl-version 8e8672c FindOpenSSL: improve version number handling
| * | | | | | | | | FindOpenSSL: also parse version number define with uppercase lettersRolf Eike Beer2012-01-171-2/+2
| | | | | | | | | |
| * | | | | | | | | FindOpenSSL: only try to parse opensslv.h if it existsRolf Eike Beer2012-01-171-1/+1
| | | | | | | | | |
| * | | | | | | | | Merge branch 'master' of git://cmake.org/cmake into openssl-versionRolf Eike Beer2012-01-171-1/+1
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | FindOpenSSL: improve version number handlingRolf Eike Beer2012-01-131-8/+32
| | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | First this fixes the bug that e.g. version "1.0.0" was shown as "1..". When pkg-config was used to find OpenSSL the header file was parsed for the version number even if pkg-config returned it already. Finally we also include the patch level (i.e. the letter after the version number) in OPENSSL_VERSION.
* | | | | | | | | | Merge topic 'FindProtobuf_import_dirs'David Cole2012-01-251-0/+13
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 27bc9e2 FindProtobuf: Update documentation comment for 2.8.8 84079c9 FindProtobuf: Merge patch that allows extra import dirs
| * | | | | | | | | | FindProtobuf: Update documentation comment for 2.8.8Philip Lowman2012-01-041-1/+1
| | | | | | | | | | |
| * | | | | | | | | | FindProtobuf: Merge patch that allows extra import dirsPhilip Lowman2011-12-181-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added support for additional import paths during protoc invocation time to the PROTOBUF_GENERATE_CPP public macro via a new PROTOBUF_IMPORT_DIRS optional variable. Patch courtesy of Miroslav Kes <mkes@ra.rockwell.com>
* | | | | | | | | | | KWSys Nightly Date StampKWSys Robot2012-01-251-1/+1
| | | | | | | | | | |
generated by cgit v0.12 at 2025-01-10 06:57:19 (GMT)