summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Tests: Speed up RunCMake.CheckModules testBrad King2014-02-063-1/+5
| | | | | | Enable the C and CXX languages only in the test cases that really need them. In the failure cases we do not get far enough to really use the languages, so skip enabling them.
* Merge topic 'FindOpenSSL-root-dir'Brad King2014-02-061-4/+5
|\ | | | | | | | | 12d6eb63 FindOpenSSL: Honor OPENSSL_ROOT_DIR everywhere (#14735)
| * FindOpenSSL: Honor OPENSSL_ROOT_DIR everywhere (#14735)Ho Cheung2014-02-051-4/+5
| | | | | | | | | | | | In commit v2.8.5~176^2~2 (FindOpenSSL: We should only use hints to find OpenSSL, 2011-03-28) values for HINTS and PATHS of find_* calls were computed everywhere but only used on Windows. Use them everywhere.
* | Merge topic 'Qt4-WIN32-doc'Brad King2014-02-061-1/+2
|\ \ | | | | | | | | | | | | 0f5dfd10 Help: Specify that qtmain.lib is only used for WIN32 executables.
| * | Help: Specify that qtmain.lib is only used for WIN32 executables.Stephen Kelly2014-02-051-1/+2
| |/
* | Merge topic 'fix-Qt-autogen'Brad King2014-02-063-13/+28
|\ \ | | | | | | | | | | | | 8f8edeb0 QtAutogen: Only add source files to the target if AUTORCC is ON.
| * | QtAutogen: Only add source files to the target if AUTORCC is ON.Stephen Kelly2014-02-053-13/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The qtx_add_resources() macro adds the resource file to the output list to maintain file-level dependencies. Having the qrc file in a target sources is a precondition for AUTORCC to function. When processing the source files of a target, only add the generated qrc_<file>.cpp to the target sources if AUTORCC is ON. This avoids pre-porting conflict with the macro. Reported-by: Micha Hergarden
* | | CMake Nightly Date StampKitware Robot2014-02-061-1/+1
| |/ |/|
* | Merge topic 'doc-version-components'Brad King2014-02-055-20/+50
|\ \ | | | | | | | | | | | | 52e7beb6 Help: Expand documentation of CMAKE_VERSION and related variables
| * | Help: Expand documentation of CMAKE_VERSION and related variablesBrad King2014-02-055-20/+50
| |/ | | | | | | | | | | | | | | | | | | | | Describe the meaning of each version component in more detail in the documentation of CMAKE_VERSION. Simplify the per-component version variable documentation by referencing the main variable. Include information about how to compare version strings. Also add an historical note about the version scheme used prior to commit v2.8.2~105^2~4 (New version scheme to support branchy workflow, 2010-04-23).
* | Merge topic 'no-policy-tweak-version'Brad King2014-02-052-70/+54
|\ \ | | | | | | | | | | | | 101057b5 Drop tweak version component from CMake Policies
| * | Drop tweak version component from CMake PoliciesBrad King2014-02-042-70/+54
| |/ | | | | | | | | | | | | | | | | | | | | | | | | Since commit v2.8.2~105^2~2 (Teach CMake Policies about tweak version component, 2010-04-23), cmPolicies has known how to handle a policy introduced in a tweak version. This was done back when we introduced policies with the current development date version and later updated it to the release version. Now we always introduce policies using the next expected release version and explicitly set the policy to test the NEW behavior. CMake Policies (or any other features) should never be introduced in a tweak (bugfix) release, so drop the infrastructure that allows this.
* | Merge topic 'release-notes'Brad King2014-02-055-1/+54
|\ \ | | | | | | | | | | | | | | | | | | ccc87047 Help: Add documents to collect notes between releases 70309e70 Help: Add documents for release notes 34ea1f15 Utilities/Sphinx: Add option to build 'text' format
| * | Help: Add documents to collect notes between releasesBrad King2014-02-043-0/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a release/dev.txt file and include it from release/index.rst in development versions. Add a "Changes Since Release" section with a toctree that globs adjacent "dev/*" documents. Add a sample topic document explaining how topic-specific release note documents work. This approach will allow developers to write release notes for their changes as they are made. The release manager may then consolidate and organize the notes for a specific release version.
| * | Help: Add documents for release notesBrad King2014-02-042-0/+18
| | | | | | | | | | | | | | | | | | Add a release/index.rst document titled "CMake Release Notes" to hold the toctree for release notes. Add a "Release Notes" section to the top-level html document index to link to the new document.
| * | Utilities/Sphinx: Add option to build 'text' formatBrad King2014-02-041-1/+7
| | | | | | | | | | | | | | | | | | | | | Add SPHINX_TEXT to enable the Sphinx 'text' builder. Mark it as advanced and do not add install rules. This is intended for use by the release manager to build the release notes in text format suitable for email.
* | | Merge topic 'AUTOMOC-docs'Brad King2014-02-051-2/+5
|\ \ \ | | | | | | | | | | | | | | | | 635e96dd Help: Be clearer about which header files are considered for AUTOMOC
| * | | Help: Be clearer about which header files are considered for AUTOMOCAlex Merry2014-02-041-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The old documentation stated that "all header files" were considered, which was not true for any sensible definition of "all header files". Only header files with certain names are considered. Document the filename patterns matched for parsing.
* | | | Merge topic 'FeatureSummary-no-transitive'Brad King2014-02-053-0/+21
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | a6971f65 FeatureSummary: Don't list transitive package dependencies
| * | | | FeatureSummary: Don't list transitive package dependenciesStephen Kelly2014-02-033-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set a global property in the find_package implementation. Track and reset that property in the find_dependency macro. Read the property in FeatureSummary when determining whether to print output. This means that packages which are found only as dependencies are not listed by FeatureSummary, but if a project uses find_package elsewhere directly, then it will be listed by FeatureSummary. Suggested-by: Alex Merry http://thread.gmane.org/gmane.comp.kde.devel.frameworks/10640
* | | | | CMake Nightly Date StampKitware Robot2014-02-051-1/+1
| |_|_|/ |/| | |
* | | | Merge topic 'fix-Qt-autogen'Brad King2014-02-049-24/+55
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | 6053ce22 QtAutogen: Make uic work even when the source is in a subdir. 1fc9ecfa FindQt4: Make AUTOMOC work regardless which order Qt 4/5 is found.
| * | | | QtAutogen: Make uic work even when the source is in a subdir.Stephen Kelly2014-02-046-22/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Modify the includedUis to store the path to the file which includes the ui file. Reuse that path to generate the output file from the uic process.
| * | | | FindQt4: Make AUTOMOC work regardless which order Qt 4/5 is found.Stephen Kelly2014-01-293-2/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 321e348e (QtAutogen: Use Qt 4 IMPORTED targets to find executable locations., 2014-01-24) attempted to fix this problem, but only solved it for a particular ordering of find_package for Qt 4 and Qt 5. Add a test to ensure that it works with both orderings.
* | | | | Merge topic 'osx-rpath-unique'Brad King2014-02-047-11/+94
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | 028a5285 OS X: Make sure RPATHs are unique to avoid possible corruption.
| * | | | OS X: Make sure RPATHs are unique to avoid possible corruption.Clinton Stimpson2014-02-037-11/+94
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When using link_directories() and including CMAKE_CFG_INTDIR, one can end up with duplicate RPATHs in the binary which install_name_tool cannot fix without corrupting the binary. Also, the cmake_install.cmake file has been fixed to correctly handle these generator specific variables.
* | | | | CMake Nightly Date StampKitware Robot2014-02-041-1/+1
| |_|_|/ |/| | |
* | | | Merge topic 'intro-docs'Brad King2014-02-032-0/+10
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 395881f7 README: Credit Kitware and community of contributors
| * | | | README: Credit Kitware and community of contributorsBrad King2014-02-032-0/+10
| | | | |
* | | | | Merge topic 'minor-cleanups'Brad King2014-02-032-9/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | dcd443d4 cmTarget: Clean up the InsertCompileDefinition implementation.
| * | | | | cmTarget: Clean up the InsertCompileDefinition implementation.Stephen Kelly2014-02-022-9/+3
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | It accepts a before parameter but is never called with before=true. compile definitions are sorted by std::set, so it wouldn't make sense to allow user sorting.
* | | | | Merge topic 'cmake-qt-manual'Brad King2014-02-033-72/+186
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4271a4ed Help: Add information about INTERFACE_AUTOUIC_OPTIONS. 7935f4de Help: Note that AUTOMOC consumes the defines and includes from targets. 2739a6f9 Help: Move Qt tool invocation information to a generic cmake-qt manual.
| * | | | | Help: Add information about INTERFACE_AUTOUIC_OPTIONS.Stephen Kelly2014-02-021-0/+40
| | | | | |
| * | | | | Help: Note that AUTOMOC consumes the defines and includes from targets.Stephen Kelly2014-02-021-0/+4
| | | | | |
| * | | | | Help: Move Qt tool invocation information to a generic cmake-qt manual.Stephen Kelly2014-02-023-72/+142
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add an introduction about the use of different package types, and the ability to use Qt 4 and 5 versions together in a single buildsystem. Add a section about automatic linking of the qtmain.lib library and how to disable it.
* | | | | Merge topic 'constify'Brad King2014-02-032-10/+10
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f054201d cmMakefile: Return containers by const reference. d1ac6ffd cmMakefile: Fix minor indentation inconsistency.
| * | | | | cmMakefile: Return containers by const reference.Stephen Kelly2014-02-022-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | They are not implicitly shared.
| * | | | | cmMakefile: Fix minor indentation inconsistency.Stephen Kelly2014-02-021-4/+4
| |/ / / /
* | | | | Merge topic 'fix-visibility-inlines-hidden'Brad King2014-02-036-1/+68
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | efdcebdd VisibilityInlinesHidden: only apply -fvisibility-inlines-hidden to C++ sources
| * | | | | VisibilityInlinesHidden: only apply -fvisibility-inlines-hidden to C++ sourcesNils Gladitz2014-02-016-1/+68
| | | | | |
* | | | | | Merge topic 'codelite-generator-multi-jobs-bug-fix'Brad King2014-02-031-2/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 75c05113 CodeLite: Use make -jN switch when generating Unix/MinGW makefiles
| * | | | | | CodeLite: Use make -jN switch when generating Unix/MinGW makefilesEran Ifrah2014-02-031-2/+6
| | | | | | |
* | | | | | | 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
generated by cgit v0.12 at 2024-12-29 06:28:04 (GMT)