summaryrefslogtreecommitdiffstats
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'issue_10199'Brad King2010-09-141-4/+10
|\ | | | | | | | | 80bad29 Issue 10199: Fixed code documentation and now set <prefix>_WC_ROOT
| * Issue 10199: Fixed code documentation and now set <prefix>_WC_ROOTMarcel Loose2010-09-131-4/+10
| |
* | Merge topic 'CUDAv3.2PathChanges'Brad King2010-09-141-3/+22
|\ \ | | | | | | | | | | | | 4f0636e Added CUDA 3.2 directory changes. Disable emulation mode for CUDA 3.1+.
| * | Added CUDA 3.2 directory changes. Disable emulation mode for CUDA 3.1+.James Bigler2010-09-101-3/+22
| |/ | | | | | | | | | | | | | | | | | | CUDA 3.2 on Windows systems changed the layout of the library paths. This adds the extra directories needed to locate the new files. I also explicitly disable emulation mode for CUDA 3.1+. This feature was deprecated in 3.0 and ultimately removed in 3.1. The script errors out if CUDA_BUILD_EMULATION is turned on. I didn't want to ignore emulation mode (even with a warning - which most people may not even see) and have users confused as to why it wasn't working.
* | Correct CMAKE_INSTALL_PREFIX value for Win64 apps (#9992)David Cole2010-09-091-13/+89
|/ | | | | | | | | | | | | The default value for CMAKE_INSTALL_PREFIX should be based on what architecture the built targets are, not what architecture CMake itself is. This fix merely guesses better what the built targets architecture is. It still may guess incorrectly in some cases. For those cases, it will have to be up to build scripts and developers on projects to pass in a correct value for CMAKE_INSTALL_PREFIX with -D on the command line or via 'force cache value' logic in CMakeLists.txt files.
* Merge topic 'allow_upper_case_cpp_and_others'Brad King2010-09-081-2/+2
|\ | | | | | | | | | | | | | | 7944e4e Allow testing of .CPP on WIN32 as it is a case insensitive OS and should work. ba0a890 Only test for .CPP on Microsoft compilers which will handle .CPP as c++. d26cd46 Only use .CPP .CXX and .C++ do not work by default with g+++. ced61f5 Let CMake recognize .CPP .CXX and .C++ as c++ files.
| * Only use .CPP .CXX and .C++ do not work by default with g+++.Bill Hoffman2010-09-021-1/+1
| |
| * Let CMake recognize .CPP .CXX and .C++ as c++ files.Bill Hoffman2010-09-021-2/+2
| |
* | Merge topic 'FindwxWidgets-fixes'Brad King2010-09-082-30/+39
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | ede24f8 ENH #8993: FindwxWidgets add support for wx-config custom options. 3dbeeb7 BUG #8184: Fixed FindwxWidgets wrong order of default libs for MinGW. f46712e BUG #11123: Generic include dir should come after config specific one. 6cb14eb STYLE: Clarified/Fixed documentation of UsewxWidgets. 36c15a2 BUG #10658: FindwxWidgets USE_FILE should not include .cmake extension.
| * | ENH #8993: FindwxWidgets add support for wx-config custom options.Miguel A. Figueroa-Villanueva2010-09-051-5/+15
| | | | | | | | | | | | | | | Added suport for setting a custom toolkit, refix, etc. when using wx-config.
| * | BUG #8184: Fixed FindwxWidgets wrong order of default libs for MinGW.Miguel A. Figueroa-Villanueva2010-09-012-5/+7
| | | | | | | | | | | | | | | Also fixed usage sample in comments, which can be misleading for MinGW users as demonstrated by mantis issue #10089.
| * | BUG #11123: Generic include dir should come after config specific one.Miguel A. Figueroa-Villanueva2010-09-011-10/+10
| | |
| * | STYLE: Clarified/Fixed documentation of UsewxWidgets.Miguel A. Figueroa-Villanueva2010-09-011-10/+7
| | |
| * | BUG #10658: FindwxWidgets USE_FILE should not include .cmake extension.Miguel A. Figueroa-Villanueva2010-09-011-1/+1
| | | | | | | | | | | | | | | The wxWidgets_USE_FILE variable to be used with the include command should be set to UsewxWidgets; not UsewxWidgets.cmake.
* | | Merge topic 'fix-10417'Brad King2010-09-082-3/+24
|\ \ \ | | | | | | | | | | | | | | | | e93a4b4 Avoid adding self as prerequisite. (#10417)
| * | | Avoid adding self as prerequisite. (#10417)David Cole2010-09-082-3/+24
| | |/ | |/| | | | | | | Thanks to Clinton Stimpson for the patch.
* | | Merge topic 'fix-9284'Brad King2010-09-081-0/+7
|\ \ \ | | | | | | | | | | | | | | | | 88fed66 Make bundle items writable before fixup (#9284)
| * | | Make bundle items writable before fixup (#9284)Mike McQuaid2010-09-081-0/+7
| |/ / | | | | | | | | | | | | | | | | | | | | | This ensures that any bundle items are made user writable before any attempt is made to alter them using install_name_tool. This is because MacPorts/Fink/Homebrew don't install libraries as writable. This fix is needed to allow fixup_bundle_item to work correctly when ingesting libraries installed by these package managers.
* | | Merge topic 'hpux-required-runtime-path-10571'Brad King2010-09-081-0/+2
|\ \ \ | | | | | | | | | | | | | | | | 11a917d HP-UX: Always add /usr/lib to rpath (#10571)
| * | | HP-UX: Always add /usr/lib to rpath (#10571)Brad King2010-09-071-0/+2
| |/ / | | | | | | | | | | | | | | | | | | Set CMAKE_PLATFORM_REQUIRED_RUNTIME_PATH in the HP-UX platform file to tell CMake to pass -Wl,+b,/usr/lib no matter whether RPATH is enabled or not. This corrects the behavior of -Wl,+nodefaultrpath to look in this default library path as documented.
* | | Merge topic '11186'Brad King2010-09-081-3/+8
|\ \ \ | | | | | | | | | | | | | | | | c167595 Merge patch for detecting gdk-pixbuf library
| * | | Merge patch for detecting gdk-pixbuf libraryPhilip Lowman2010-09-041-3/+8
| |/ / | | | | | | | | | | | | | | | | | | The gdk-pixbuf library was split off from core GTK in 2.21 so it could be used separately by people outside GTK. Now FindGTK searches and adds it to the library/include list. Thanks to Vincent Untz for the patch and Ricardo Cruz for the heads up.
* | | Merge topic 'vs-project-groups'Brad King2010-09-081-0/+2
|\ \ \ | | | | | | | | | | | | | | | | e6ac0aa Add FOLDER target property, for IDEs (#3796)
| * | | Add FOLDER target property, for IDEs (#3796)David Cole2010-09-031-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This work was started from a patch by Thomas Schiffer. Thanks, Thomas! See the newly added documentation of the FOLDER target property for details. Also added global properties, USE_FOLDERS and PREDEFINED_TARGETS_FOLDER. See new docs here, too. By default, the FOLDER target property is used to organize targets into folders in IDEs that have support for such organization. This commit adds "solution folder" support to the Visual Studio generators. Currently works with versions 7 through 10. Also, use the new FOLDER property in the ExternalProject test and in the CMake project itself.
* | | | Merge topic 'watcom_fixes'Brad King2010-09-081-3/+16
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 3b7da53 Fix for bug 10388, fix various default flags.
| * | | | Fix for bug 10388, fix various default flags.Bill Hoffman2010-09-021-3/+16
| | |/ / | |/| |
* | | | Merge topic 'find-macports'Brad King2010-09-082-3/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | eae45a6 Search MacPorts /opt/local prefix on Mac
| * | | | Search MacPorts /opt/local prefix on MacBrad King2010-09-012-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Include this prefix in CMAKE_SYSTEM_PREFIX_PATH so that it will be used for all find* commands. Previously only find_library and find_path would look under /opt/local/lib and /opt/local/include, respectively.
* | | | | Merge topic 'ImproveFindPackageConfigMode'Brad King2010-09-081-61/+111
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5cdfc9c Improve wording of the error message of find_package() in config-mode 4969c3b Improve version notice in the generated message e8ae504 Add option CONFIG_MODE to FPHSA() b4b8f96 Don't create an empty element at the end of Foo_CONSIDERED_CONFIGS/VERSIONS cc955a0 Small cleanup of FindPackageHandleStandardArgs.cmake 0367245 Replace the two vector<string,string> with one vector<struct{string,string}> 130b0e2 Improve error message in Config-mode when no appropriate version was found dfe9c95 Record all considered Config files and their versions.
| * | | | Improve version notice in the generated messageAlex Neundorf2010-08-301-53/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now the version number is also printed if no required version was specified, but a version number was detected (showing more information shouldn't hurt). The code for generating the failure message in config-mode is moved into a separate helper macro, it was becoming too much. Alex
| * | | | Add option CONFIG_MODE to FPHSA()Alex Neundorf2010-08-291-9/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When this option is used for FPHSA(), it automatically handles the information created by a preceding find_package(NO_MODULE) all and creates a proper success/error message. Alex
| * | | | Small cleanup of FindPackageHandleStandardArgs.cmakeAlex Neundorf2010-08-291-21/+17
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | -remove unnecessary arguments _VAR1 -move code for deciding the type of the message into helper macro _FPHSA_FAILURE_MESSAGE() Alex
* | | | Merge topic 'FindGTK2_10688'Brad King2010-09-011-1/+5
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | 7828932 10688: FindGTK2.cmake doesn't auto-detect macports
| * | | 10688: FindGTK2.cmake doesn't auto-detect macportsPhilip Lowman2010-08-201-1/+5
| | | |
* | | | Merge topic 'FindwxWidgets-fixed-bug-9775'Brad King2010-08-311-4/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | f51eb9c BUG: #9775 Fixed patch FindwxWidgets-fixed-bug-9775. 6bbf2a0 ENH: #9775 Added support for new wxWidgets 2.9 libraries.
| * | | | BUG: #9775 Fixed patch FindwxWidgets-fixed-bug-9775.Miguel A. Figueroa-Villanueva2010-08-301-2/+3
| | | | | | | | | | | | | | | | | | | | Forgot to add new libraries in list of libs to be cleared.
| * | | | ENH: #9775 Added support for new wxWidgets 2.9 libraries.Miguel A. Figueroa-Villanueva2010-08-291-2/+3
| | |/ / | |/| | | | | | | | | | | | | | | | | | Added support for new libraries in wxWidgets 2.9 that are part of the main distribution. These are: wxPropertyGrid, wxSTC, wxScintilla, and wxRibbon.
* | | | Merge topic 'FindPackageLogVersion'Brad King2010-08-311-29/+180
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 88e6447 Add macro ADD_FEATURE_INFO() and improve docs. b353524 Improve wording of the documentation. 6fc88b2 Improve documentation. 3333878 Log the required package version and major improvement to FeatureSummary
| * | | | Add macro ADD_FEATURE_INFO() and improve docs.Alex Neundorf2010-08-251-20/+70
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ADD_FEATURE_INFO() can be used to set the info for a feature, e.g. an option(). set_feature_info() has been renamed to set_package_info(), since this is about found or not found packages. For compatiblity set_feature_info() is still provided. Alex
| * | | | Improve wording of the documentation.Alex Neundorf2010-08-241-5/+7
| | | | | | | | | | | | | | | | | | | | Alex
| * | | | Improve documentation.Alex Neundorf2010-08-241-21/+57
| | | | | | | | | | | | | | | | | | | | Alex
| * | | | Log the required package version and major improvement to FeatureSummaryAlex Neundorf2010-08-241-14/+77
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | find_package() now also stores the required version automatically, so it can be used by FeatureSummary.cmake. This was one of the requested features for setting up nightly builds for KDE, since with this functionality it will be possible to write a file at the end of each project which lists all required packages and their versions. This file could then be compared for equality with an older one and if something has changed the build maintainer can be emailed. In FeatureSummary.cmake there is now a new function feature_summary(), which also allows to print the log to a file or into a variable. It also allows to specify whether to append to a file or to write a new one, and what information to log. Docs are still missing. Alex
* | | | Merge topic 'fix-10747'Brad King2010-08-312-240/+204
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 90add6b Refine formatting for cmake --help-module output. af0c719 Merge branch 'patches/docBundleUtilities' 51cc861 Improve documentation of GetPrerequisites.cmake f811470 Improve documentation of BundleUtilities.cmake
| * | | | Refine formatting for cmake --help-module output.David Cole2010-08-252-9/+6
| | | | | | | | | | | | | | | | | | | | Also refer to self as module, not script.
| * | | | Merge branch 'patches/docBundleUtilities'David Cole2010-08-252-237/+204
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | of http://github.com/themiwi/CMake into fix-10747 Conflicts: Modules/BundleUtilities.cmake There was one newly added function in BundleUtilities.cmake which also needed the same "documentation at top" treatment.
| | * | | Improve documentation of GetPrerequisites.cmakeMichael Wild2010-05-231-110/+91
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Put the function documentation into the header-comment, improve formatting and list the user-relevant functions first. Signed-off-by: Michael Wild <themiwi@users.sourceforge.net>
| | * | | Improve documentation of BundleUtilities.cmakeMichael Wild2010-05-231-116/+103
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Put the function documentation into the header-comment, improve formatting and list the user-relevant functions first. Signed-off-by: Michael Wild <themiwi@users.sourceforge.net>
* | | | | Merge topic 'CPack-FixDESTDIR-Issue7000'Brad King2010-08-311-8/+39
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3178767 Merge 'CPack-FixDESTDIR-Issue7000' from github.com:TheErk/CMake 6a521f8 CPack Enable better handling of absolute installed files 40dc97d CPack Backward-compatibly enforce DESTDIR for DEB and RPM
| * \ \ \ \ Merge 'CPack-FixDESTDIR-Issue7000' from github.com:TheErk/CMakeEric NOULARD2010-08-241-8/+39
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | CPack Enable better handling of absolute installed filesEric NOULARD2010-08-231-8/+39
| | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The idea of the patch is to let the install generator define CPACK_ABSOLUTE_INSTALL_FILES then when CMake is installing project he will concatenate the list of files and give it to specific CPack Generator by defining CPACK_ABSOLUTE_INSTALL_FILES to be the list of ALL files that were installed using absolute destination. An example of use has been applied to RPM generator which now tries to automatically build a relocatable package.