summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'FindCUDA-doc-format'Brad King2014-02-031-161/+4
|\ | | | | | | | | 1f8eb5db FindCUDA: Fix literal block formatting
| * FindCUDA: Fix literal block formattingBrad King2014-01-291-161/+4
| | | | | | | | Fix locations of '::' manually to group literal blocks as desired.
* | Merge topic 'find-java-os-x-fixes'Brad King2014-02-033-56/+132
|\ \ | | | | | | | | | | | | | | | | | | | | | dd72b19f Find{Java,JNI}: Use /usr/libexec/java_home on OS X 70560ee1 FindJNI: Overhaul finding JDK libraries and headers on OS X fcd66a7f Find{Java,JNI}: Consider JAVA_HOME before ENV{JAVA_HOME} 4b3614b2 Find{Java,JNI}: Use ENV{JAVA_HOME} first when set
| * | Find{Java,JNI}: Use /usr/libexec/java_home on OS XBrad King2014-01-291-0/+11
| | | | | | | | | | | | | | | | | | | | | If no JAVA_HOME or ENV{JAVA_HOME} is set then try running this tool to get the system default Java home. Suggested-by: Larry Shaffer <larrys@dakotacarto.com>
| * | FindJNI: Overhaul finding JDK libraries and headers on OS XBrad King2014-01-291-36/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Drop the hard-coded framework paths and "-framework JavaJM" on APPLE. Save and restore the value of CMAKE_FIND_FRAMEWORK. Use its value to choose and order between a normal search for jvm&jawt and a framework search for JavaVM. When JAVA_HOME is set explicitly by the user then force a normal search by setting CMAKE_FIND_FRAMEWORK to NEVER. Once the library is found, set CMAKE_FIND_FRAMEWORK to help find_path locate the matching headers (framework v. normal).
| * | Find{Java,JNI}: Consider JAVA_HOME before ENV{JAVA_HOME}Brad King2014-01-293-5/+40
| | | | | | | | | | | | | | | | | | Add a helper module CMakeFindJavaCommon shared between FindJava and FindJNI to select a JAVA_HOME value. Prefer a CMake variable or cache entry first, then an environment variable.
| * | Find{Java,JNI}: Use ENV{JAVA_HOME} first when setBrad King2014-01-292-17/+27
| |/ | | | | | | | | | | Use list(APPEND) instead of set() to append to lists. When ENV{JAVA_HOME} is set explicitly place values based on it at the front their lists.
* | Merge topic 'intro-docs'Brad King2014-02-033-53/+107
|\ \ | | | | | | | | | | | | da875492 Update README and add guidelines for CONTRIBUTING
| * | Update README and add guidelines for CONTRIBUTINGBrad King2014-01-293-53/+107
| | | | | | | | | | | | | | | | | | | | | Rename 'Readme.txt' to 'README.rst', format the documentation as reStructuredText, and modernize the content. Also add a new 'CONTRIBUTING.rst' explaining the preferred entry path for new contributors.
* | | Merge topic 'emacs-mode-enhance'Brad King2014-02-031-36/+30
|\ \ \ | | | | | | | | | | | | | | | | | | | | 3af47e34 cmake-mode.el: Add auto-completion to cmake-help-command 2a131415 cmake-mode.el: Clean up cmake-command-run and add buffername argument
| * | | cmake-mode.el: Add auto-completion to cmake-help-commandPhilipp Möller2014-01-291-8/+19
| | | |
| * | | cmake-mode.el: Clean up cmake-command-run and add buffername argumentPhilipp Möller2014-01-291-30/+13
| | | |
* | | | Merge topic 'doc-release-tarball'Brad King2014-02-035-5/+89
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ef7a1b41 Utilities/Release: Pass pre-built docs tarball 174314e0 Utilities/Release: Fix for spaces in host path 1df21617 Utilities/Release: Generate docs on dash2win64 cygwin 28abdc93 Utilities/Release: Fix newlines on dash2win64 cygwin
| * | | | Utilities/Release: Pass pre-built docs tarballBrad King2014-01-294-3/+85
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid requiring all build machines for the upstream packaging process to have Python and Sphinx installed. Instead create a way to build the documentation once on the host machine and copy it to each build machine as a tarball with content to include in the installation tree for packaging.
| * | | | Utilities/Release: Fix for spaces in host pathBrad King2014-01-291-2/+2
| | | | | | | | | | | | | | | | | | | | Quote paths in the generated shell scripts so they work with spaces.
| * | | | Utilities/Release: Generate docs on dash2win64 cygwinBrad King2014-01-291-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | Configure the build on dash2win64 cygwin to run Sphinx and generate our documentation.
| * | | | Utilities/Release: Fix newlines on dash2win64 cygwinBrad King2014-01-291-1/+1
| | |_|/ | |/| | | | | | | | | | | | | | Tell Git not to perform newline conversion by configuring 'core.autocrlf' to 'false'. Cygwin wants newlines like UNIX.
* | | | Merge topic 'project-version-variables'Brad King2014-02-0362-34/+499
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 41d2f2c4 write_basic_package_version_file: use PROJECT_VERSION 7e142c5a project: Manage VERSION variables 16d040c9 project: Add optional LANGUAGES keyword 00007dcc Help: Format project command and variable documentation
| * | | | write_basic_package_version_file: use PROJECT_VERSIONAlex Neundorf2014-01-292-3/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the write_basic_package_version_file(), the VERSION argument is now optional. If none is given, it falls back to ${PROJECT_VERSION}. Alex
| * | | | project: Manage VERSION variablesBrad King2014-01-2943-2/+401
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Teach the project() command to set variables {PROJECT,<PROJECT-NAME>}_VERSION{,_MAJOR,_MINOR,_PATCH,_TWEAK} holding the project version number and its components. Add project() command option "VERSION" to specify the version explicitly, and default to the empty string when it is not given. Since this clears variables when no VERSION is given, this may change behavior for existing projects that set the version variables themselves prior to calling project(). Add policy CMP0048 for compatibility. Suggested-by: Alex Neundorf <neundorf@kde.org>
| * | | | project: Add optional LANGUAGES keywordBrad King2014-01-2914-5/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Teach the project() command to recognize an optional "LANGUAGES" keyword after the project name and prior to the list of languages. Do not allow multiple copies of the keyword. If the keyword is specified and no languages are listed, imply NONE.
| * | | | Help: Format project command and variable documentationBrad King2014-01-298-28/+39
| | | | | | | | | | | | | | | | | | | | Also add document for CMAKE_PROJECT_<PROJECT-NAME>_INCLUDE variable.
* | | | | CMake Nightly Date StampKitware Robot2014-02-031-1/+1
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2014-02-021-1/+1
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2014-02-011-1/+1
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2014-01-311-1/+1
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2014-01-301-1/+1
| |/ / / |/| | |
* | | | Merge topic 'fix-Qt-autogen'Brad King2014-01-2913-250/+274
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f7ae1d8a QtAutogen: Short-circut some logic when moc is not available. 4b989d5f QtAutogen: Separate source file processing from AUTOMOC. c48d877d QtAutogen: Make some methods appropriately file-static. 394e86df QtAutogen: Fix autouic target options in the presence of a config. 964d7f2a QtAutogen: Remove unused variables. 0d934efd QtAutogen: Remove read of SKIP_AUTOUIC target property. 321e348e QtAutogen: Use Qt 4 IMPORTED targets to find executable locations. e96683b0 Qt4: Use IMPORTED executable names with custom commands. e6182f5d Qt4: Create IMPORTED executable targets for all Qt executables.
| * | | | QtAutogen: Short-circut some logic when moc is not available.Stephen Kelly2014-01-285-3/+85
| | | | | | | | | | | | | | | | | | | | | | | | | This is the case when AUTOMOC is false. This prevents creating rules to moc the files in the absense of moc.
| * | | | QtAutogen: Separate source file processing from AUTOMOC.Stephen Kelly2014-01-283-95/+73
| | | | | | | | | | | | | | | | | | | | This will allow using AUTOUIC without using AUTOMOC for example.
| * | | | QtAutogen: Make some methods appropriately file-static.Stephen Kelly2014-01-282-38/+31
| | | | |
| * | | | QtAutogen: Fix autouic target options in the presence of a config.Stephen Kelly2014-01-281-1/+5
| | | | | | | | | | | | | | | | | | | | Read the correct variable. Add scopes to prevent escape of variables.
| * | | | QtAutogen: Remove unused variables.Stephen Kelly2014-01-281-2/+0
| | | | |
| * | | | QtAutogen: Remove read of SKIP_AUTOUIC target property.Stephen Kelly2014-01-281-7/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Skipping AUTOUIC for a target is achieved by setting the AUTOUIC target property go OFF.
| * | | | QtAutogen: Use Qt 4 IMPORTED targets to find executable locations.Stephen Kelly2014-01-285-32/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid using the moc from Qt 5 with Qt 4 based targets. Moc generates a version check to ensure that such generated code does not compile. The Qt4And5Automoc unit test should have been testing this, but it was not because the test was broken. In that unit test, moc was run on trivial files which have no significant content, and in particular no Q_OBJECT macro. Therefore moc was generating empty files which do not even contain the version check. Fix this by generating files for input to moc at cmake time.
| * | | | Qt4: Use IMPORTED executable names with custom commands.Stephen Kelly2014-01-281-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Finding Qt 5 can overwrite the QT_MOC_EXECUTABLE variable with the moc from Qt 5. Use the IMPORTED target with the explicit version in the name to avoid that.
| * | | | Qt4: Create IMPORTED executable targets for all Qt executables.Stephen Kelly2014-01-281-64/+22
| | | | | | | | | | | | | | | | | | | | | | | | | Qt 5 already has similar IMPORTED targets. The versioned namespace will allow de-conflicting the variable names between Qt 4 and Qt 5.
* | | | | Merge topic 'ExternalProject-git-submodules'Brad King2014-01-292-6/+25
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 819015ef ExternalProject: Add option GIT_SUBMODULES
| * | | | | ExternalProject: Add option GIT_SUBMODULESGereon Kremer2014-01-282-6/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This option allows to filter the submodules that are checked out. Add a simple testcase for GIT_SUBMODULES option passing an empty list.
* | | | | | Merge topic 'cygwin-RunCMake-tests'Brad King2014-01-294-4/+4
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | 5e4b8871 Cygwin: Avoid legacy warnings in RunCMake.CMP004[1235] tests
| * | | | | Cygwin: Avoid legacy warnings in RunCMake.CMP004[1235] testsBrad King2014-01-284-4/+4
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | Set the minimum required version of CMake high enough to avoid the warning for CMAKE_LEGACY_CYGWIN_WIN32. The warning appears on stderr and breaks the expected output matching.
* | | | | Merge topic 'emacs-mode-byte-compile'Brad King2014-01-291-25/+24
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9b3876bf cmake-mode.el: Replace 'setq' with 'let' or inlining d3db7126 cmake-mode.el: Don't assign to free variable save-point fbc3a6f3 cmake-mode.el: Avoid using beginning-of-buffer
| * | | | | cmake-mode.el: Replace 'setq' with 'let' or inliningPhilipp Möller2014-01-281-22/+23
| | | | | |
| * | | | | cmake-mode.el: Don't assign to free variable save-pointPhilipp Möller2014-01-281-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Drop use of the free variable from unscreamify-cmake-buffer. The proper way to do this would be defvar or let, but it is more sensible to drop the feature completely: replace-match will shift the point and the saved-point will be invalid. More careful coding could avoid this, but seems overkill.
| * | | | | cmake-mode.el: Avoid using beginning-of-bufferPhilipp Möller2014-01-281-1/+1
| | |/ / / | |/| | | | | | | | | | | | | | | | | | This should not be used from lisp programs. Use the replacement suggested by the doc: (goto-char (point-min))
* | | | | Merge topic 'doc-install-no-build-info'Brad King2014-01-291-1/+4
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | 0c3cf36b Help: Do not install Sphinx html build info files
| * | | | Help: Do not install Sphinx html build info filesBrad King2014-01-281-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | Exclude '.buildinfo' and 'objects.inv' from installation as part of the Sphinx-generated html documentation.
* | | | | CMake Nightly Date StampKitware Robot2014-01-291-1/+1
| |_|/ / |/| | |
* | | | Merge branch 'release'Brad King2014-01-281-0/+17
|\ \ \ \ | |_|/ / |/| | |
| * | | CMake 2.8.12.2v2.8.12.2Brad King2014-01-162-1/+18
| | | |
generated by cgit v0.12 at 2025-01-08 12:16:53 (GMT)