summaryrefslogtreecommitdiffstats
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'MakeDefaultInstallComponentNameConfigurable'David Cole2012-05-241-2/+6
|\ | | | | | | | | | | | | b71e731 -add docs for ${CMAKE_INSTALL_DEFAULT_COMPONENT_NAME} 7ced073 make default install component name configurable b6fba35 -strip trailing whitespace
| * make default install component name configurableAlex Neundorf2012-05-141-0/+4
| | | | | | | | | | | | | | | | | | Until now an unnamed component was always named "Unspecified". Now this name is taken from the new cmake variable CMAKE_INSTALL_DEFAULT_COMPONENT_NAME, which is initialized to "Unspecified". But it can now be set to something project-specific, per directory Alex
| * -strip trailing whitespaceAlex Neundorf2012-05-131-2/+2
| | | | | | | | Alex
* | Merge topic 'FindwxWidgets-OpenBSD'David Cole2012-05-171-2/+2
|\ \ | | | | | | | | | | | | 16ee197 FindwxWidgets: Do not use -isystem on OpenBSD (#13219)
| * | FindwxWidgets: Do not use -isystem on OpenBSD (#13219)Anthony J. Bentley2012-05-141-2/+2
| | | | | | | | | | | | | | | | | | Set wxWidgets_INCLUDE_DIRS_NO_SYSTEM on OpenBSD in addition to Apple to prevent UsewxWidgets.cmake from using the include_directories SYSTEM option.
* | | Merge topic 'FeatureSummaryNicerFormatting'David Cole2012-05-171-2/+2
|\ \ \ | | | | | | | | | | | | | | | | b1d7c4b FeatureSummary.cmake: nicer formatting
| * | | FeatureSummary.cmake: nicer formattingAlex Neundorf2012-05-131-2/+2
| | |/ | |/| | | | | | | Alex
* | | Merge topic 'vs11-arm-generator'David Cole2012-05-172-0/+5
|\ \ \ | |/ / |/| | | | | | | | | | | 5af93bb VS11: Fix ARM architecture hint typo (#13077) 0fa3d09 VS11: Add ARM architecture generator (#13077)
| * | VS11: Fix ARM architecture hint typo (#13077)Brad King2012-05-101-1/+1
| | |
| * | VS11: Add ARM architecture generator (#13077)Minmin Gong2012-05-092-0/+5
| | |
* | | Fix the number variable comparison when Qt is not found.Stephen Kelly2012-05-031-1/+1
| | |
* | | Abort FindQt4.cmake if Qt 5 is found.David Faure2012-05-031-4/+16
|/ /
* | Merge topic 'module-no-soname'David Cole2012-05-017-13/+13
|\ \ | | | | | | | | | | | | | | | fdb3f87 Test NO_SONAME property (#13155) e1409ac Support building shared libraries or modules without soname (#13155)
| * | Support building shared libraries or modules without soname (#13155)Modestas Vainius2012-04-307-13/+13
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a boolean target property NO_SONAME which may be used to disable soname for the specified shared library or module even if the platform supports it. This property should be useful for private shared libraries or various plugins which live in private directories and have not been designed to be found or loaded globally. Replace references to <CMAKE_SHARED_LIBRARY_SONAME_${LANG}_FLAG> and hard-coded -install_name flags with a conditional <SONAME_FLAG> which is expanded to the value of the CMAKE_SHARED_LIBRARY_SONAME_${LANG}_FLAG definition as long as soname supports is enabled for the target in question. Keep expanding CMAKE_SHARED_LIBRARY_SONAME_${LANG}_FLAG in rules in case third party projects still use it. Such projects would not yet use NO_SONAME so the adjacent <TARGET_SONAME> will always be expanded. Make <TARGET_INSTALLNAME_DIR> NO_SONAME aware as well. Since -install_name is soname on OS X, this should not be a problem if this variable is expanded only if soname is enabled. The Ninja generator performs rule variable substitution only once globally per rule to put its own placeholders. Final substitution is performed by ninja at build time. Therefore we cannot conditionally replace the soname placeholders on a per-target basis. Rather than omitting $SONAME from rules.ninja, simply do not write its contents for targets which have NO_SONAME. Since 3 variables are affected by NO_SONAME ($SONAME, $SONAME_FLAG, $INSTALLNAME_DIR), set them only if soname is enabled.
* | Merge topic 'intel-Windows-RTC1'David Cole2012-05-011-1/+1
|\ \ | | | | | | | | | | | | dd08062 Intel: On Windows use /RTC1 instead of deprecated /GZ (#13174)
| * | Intel: On Windows use /RTC1 instead of deprecated /GZ (#13174)Brad King2012-04-301-1/+1
| | |
* | | Merge topic 'fix-12564-avoid-git-re-clones'David Cole2012-05-011-29/+72
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 08db81e ExternalProject: Avoid repeated git clone operations (#12564) d14c024 ExternalProject: Refactor repeated code into function (#12564) 987c017 ExternalProject: Avoid unnecessary git clones (#12564)
| * | | ExternalProject: Avoid repeated git clone operations (#12564)David Cole2012-04-281-1/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | By tracking a stamp file within the git clone script itself. Avoids a 2nd git clone operation after switching from Debug to Release builds in Visual Studio, or vice-versa.
| * | | ExternalProject: Refactor repeated code into function (#12564)David Cole2012-04-281-27/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add "private/internal-use-only" function _ep_get_step_stampfile to get the name of the stamp file for a given step. The functionality provided by this commit should be identical to its parent commit.
| * | | ExternalProject: Avoid unnecessary git clones (#12564)David Cole2012-04-251-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the case of git, only track the repository in the repository info dependency tracking file. Not the tag. The download step should only re-run if the repository changes. The download step should NOT re-run if the tag changes. The update step is an 'always' re-running step, and so should already re-run, unless it's been eliminated by use of UPDATE_COMMAND ""
* | | | Merge topic 'more-Intel-warnings'David Cole2012-05-012-2/+6
|\ \ \ \ | |/ / / |/| | | | | | | | | | | f621ead Check{C,CXX}CompilerFlag: catch more Intel warning types (#12576)
| * | | Check{C,CXX}CompilerFlag: catch more Intel warning types (#12576)Rolf Eike Beer2012-04-262-2/+6
| | |/ | |/| | | | | | | Patch provided by Szilárd Páll.
* | | Merge topic 'intel-Windows-EHsc'David Cole2012-04-251-1/+1
|\ \ \ | | |/ | |/| | | | | | | 4f80896 Intel: On Windows use /EHsc instead of deprecated /GX (#13163)
| * | Intel: On Windows use /EHsc instead of deprecated /GX (#13163)Brad King2012-04-241-1/+1
| |/ | | | | | | | | | | | | | | | | | | Use of the deprecated option with Intel 2011 produces icl: command line remark #10010: option '/GX' is deprecated and will be removed in a future release. See '/help deprecated' so use its replacement option which has been supported for several older versions anyway.
* | Merge topic 'fix-9946-uninstall-before-install'David Cole2012-04-253-0/+34
|\ \ | | | | | | | | | | | | fe58b67 Added CPACK_NSIS_ENABLE_UNINSTALL_BEFORE_INSTALL
| * | Added CPACK_NSIS_ENABLE_UNINSTALL_BEFORE_INSTALLPatrick Gansterer2012-04-223-0/+34
| |/ | | | | | | If CPACK_NSIS_ENABLE_UNINSTALL_BEFORE_INSTALL is set to ON the NSIS installer will look for a previous installed version and ask the user about uninstall.
* | Merge topic 'fix-ExternalProject-COMMAND-niggly'David Cole2012-04-251-1/+2
|\ \ | | | | | | | | | | | | 64818c1 ExternalProject: Add missing COMMAND keyword
| * | ExternalProject: Add missing COMMAND keywordDavid Cole2012-04-221-1/+2
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit f67139ae added running a verify script in between running the download and extract scripts. Since then, it has always been missing the COMMAND keyword added in this commit. It worked anyway (semi-accidentally) by running a command line like: cmake -P script1.cmake cmake -P script2.cmake CMake, when running -P scripts on the command line, runs them in order, and apparently ignores spurious arguments in between (the middle "cmake" in the above example) and so, all appeared to work as intended. This commit adds the missing keyword and the commands that run are now two separate sequential cmake invocations like: cmake -P script1.cmake cmake -P script2.cmake ...which was the original intent of commit f67139ae
* | Merge topic 'fix-13085-add-nsis-preinstall-hook'David Cole2012-04-252-3/+12
|\ \ | | | | | | | | | | | | aa8acea CPack/NSIS: Add CPACK_NSIS_EXTRA_PREINSTALL_COMMANDS (#13085)
| * | CPack/NSIS: Add CPACK_NSIS_EXTRA_PREINSTALL_COMMANDS (#13085)David Cole2012-04-212-3/+12
| |/ | | | | | | | | | | | | | | | | | | Allows custom NSIS commands to run prior to any installation actions. Projects that need to run an uninstaller first, especially one from a non-NSIS previous revision of a project that is NOW using CPack and NSIS, may do so by putting custom NSIS commands into this variable. Inspired-by: David Golub
* | Merge topic 'CPack-fixManPage-typo'David Cole2012-04-251-0/+1
|\ \ | | | | | | | | | | | | 94b24ad Fix CPack RPM man page typo detected by lintian.
| * | Fix CPack RPM man page typo detected by lintian.Modestas Vainius2012-04-201-0/+1
| |/ | | | | | | Signed-off-by: Eric NOULARD <eric.noulard@gmail.com>
* | Merge topic 'fix-usejava-typo-13135'David Cole2012-04-251-1/+1
|\ \ | | | | | | | | | | | | 8bdd449 UseJava: fix typo in variable name (#13135)
| * | UseJava: fix typo in variable name (#13135)Rolf Eike Beer2012-04-161-1/+1
| |/ | | | | | | | | | | | | | | As Dave Abrahams pointed out CMAKE_CURRENT_SOURCE_PATH is wrong, it's of course CMAKE_CURRENT_SOURCE_DIR. Also wrap the path in quotes so the example would even work if the source path has spaces.
* | Merge topic 'fix-pkgconfig-13125'David Cole2012-04-251-2/+6
|\ \ | | | | | | | | | | | | 3ea850a FindPkgConfig.cmake: fix documented output variable not set (#13125,#13132)
| * | FindPkgConfig.cmake: fix documented output variable not set (#13125,#13132)Rolf Eike Beer2012-04-151-2/+6
| |/ | | | | | | | | The real fix is from Yury G. Kudryashov while I added the surrounding cleanups. An additional hint to really get this fixed came from Rex Dieter.
* | Merge topic 'dev/fix-python3-findmodule'David Cole2012-04-251-4/+11
|\ \ | |/ |/| | | | | | | 4bdec58 Search for other ABIFLAGS builds of Python 6a46f5c Don't put legacy variables back into the cache
| * Search for other ABIFLAGS builds of PythonBen Boeckel2012-03-271-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Starting with Python3, standard Python installs may have additional ABI flags attached to include directories and library names. As of 3.2, the following flags are in the configure file: d -> --with-debug m -> --with-pymalloc u -> --with-wide-unicode Python 3.3 seems to no longer have --with-wide-unicode. Hopefully Python will ensure that the possible flags always show up in a stable order. The 'd' flag is ignored since the debug library is considered separate. There is still the problem where ABI flags cannot be specified in find_package since the letters confuse the version comparator.
| * Don't put legacy variables back into the cacheBen Boeckel2012-03-271-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If PYTHON_INCLUDE_PATH is put into the cache, then it will always override whatever might be found and PYTHON_INCLUDE_DIR is never given a chance to find something different. It being marked as INTERNAL also means that it cannot be changed without editing CMakeCache.txt directly. Basically, the scenario is that if the Python version is changed, then deleting PYTHON_INCLUDE_DIR doesn't work because any cached PYTHON_INCLUDE_PATH variable is set before find_path is even called. Any build tree using a previous version will still need either manual removal of PYTHON_INCLUDE_PATH or a complete reconfigure, but in the future changing the Python version can be accomplished by deleting PYTHON_INCLUDE_DIR and reconfiguring with the new version.
* | Merge topic 'check_include_files_output'David Cole2012-04-101-4/+14
|\ \ | | | | | | | | | | | | 5adb6b7 CheckIncludeFiles: Shorten check description message
| * | CheckIncludeFiles: Shorten check description messageBrad King2012-04-091-4/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit 44d007b6 (CheckIncludeFiles: fix status output, 2012-02-01) check_include_files reports the list of files tested instead of the name of the variable storing the result. Some projects incrementally test and concatenate very long lists leading to long messages that do not provide much information. Users report confusion especially when the lines wrap. For lists of more than two files produce messages of the format Looing for N include files first.h, ..., last.h where N is the list length and "..." is literal. Leave the log file entries and cache entry description unchanged as they should have the full detail of the check performed.
* | | Merge topic 'new-boost-versions'David Cole2012-04-101-2/+3
|\ \ \ | | | | | | | | | | | | | | | | 63d4960 FindBoost: add support for 1.49 and 1.50
| * | | FindBoost: add support for 1.49 and 1.50Rolf Eike Beer2012-04-071-2/+3
| | | | | | | | | | | | | | | | | | | | Boost 1.49 has already be released. Add this and the next to come version number to the search list.
* | | | Merge topic 'osx-search-paths'David Cole2012-04-101-3/+17
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6190415 OS X: Mark find_program results as advanced d9edf46 OS X: Use correct extra path when searching for applicaton bundles (#13066) 98b9a7f OS X: Use OSX_DEVELOPER_ROOT for app search path (#13066)
| * | | | OS X: Mark find_program results as advancedDavid Cole2012-04-061-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | Avoid cluttering the gui with variables nearly nobody needs to see.
| * | | | OS X: Use correct extra path when searching for applicaton bundles (#13066)David Cole2012-04-061-3/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The parent commit added a search path relative to OSX_DEVELOPER_ROOT. But with Xcode 4.3 the nested Applications folder is in a different relative location compared to that root. This commit makes the intent of the previous commit work with older and newer Xcode directory layouts. Furthermore, it only adds paths that exist to the search path.
| * | | | OS X: Use OSX_DEVELOPER_ROOT for app search path (#13066)Kashif Rasul2012-03-261-1/+1
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | Since commit 4693cf84 (Xcode: Detect new default locations of Xcode 4.3 bits and pieces) Darwin.cmake detects the developer application directory instead of hard-coding /Developer. Replace the hard-coded path in CMAKE_SYSTEM_APPBUNDLE_PATH using the computed result.
* | | | Merge topic 'CPackNSIS-smallDocTypoFix'David Cole2012-04-101-3/+10
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | fcf265f CPackNSIS: Rewrite variable documentation to make it more readable. 8fe0da5 Fix some doc typo and add an undocumented var.
| * | | CPackNSIS: Rewrite variable documentation to make it more readable.David Cole2012-04-051-2/+4
| | | | | | | | | | | | | | | | And avoid parsing problems at the first "."
| * | | Fix some doc typo and add an undocumented var.Eric NOULARD2012-03-271-3/+8
| |/ /
generated by cgit v0.12 at 2025-01-12 12:05:22 (GMT)