summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* KWSys Nightly Date StampKWSys Robot2011-01-271-1/+1
|
* Merge topic 'recursive-CMAKE_USER_MAKE_RULES_OVERRIDE'Brad King2011-01-263-12/+39
|\ | | | | | | | | c83a834 try_compile: Allow only languages loaded in caller (#11469)
| * try_compile: Allow only languages loaded in caller (#11469)Brad King2011-01-243-12/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | During a try_compile cmGlobalGenerator::EnableLanguage uses results from the outer project. Reject attempts to enable languages in the test project that are not "ready" in the outer project. Mark a language as "ready" when all its information has been loaded and we are ready to generate build rules. This also avoids infinite recursion introduced by commit 295b5b60 (Honor CMAKE_USER_MAKE_RULES_OVERRIDE in try_compile, 2010-06-29) for projects that set CMAKE_USER_MAKE_RULES_OVERRIDE to a file that uses try_compile. The file is loaded along with the information for a given langauge so the language is not yet "ready".
* | Merge topic 'outdir-CMAKE_USER_MAKE_RULES_OVERRIDE'Brad King2011-01-262-14/+31
|\ \ | |/ | | | | | | | | 5792d3a Always place try_compile executables predictably (#11724) a5300f1 Clarify CMAKE_USER_MAKE_RULES_OVERRIDE documentation (#11724)
| * Always place try_compile executables predictably (#11724)Brad King2011-01-201-0/+4
| | | | | | | | | | | | | | Set CMAKE_RUNTIME_OUTPUT_DIRECTORY explicitly in try_compile projects so that the COPY_FILE feature knows where to look. This makes the feature robust against CMAKE_USER_MAKE_RULES_OVERRIDE files that set variables like CMAKE_RUNTIME_OUTPUT_DIRECTORY or EXECUTABLE_OUTPUT_PATH.
| * Clarify CMAKE_USER_MAKE_RULES_OVERRIDE documentation (#11724)Brad King2011-01-201-14/+27
| | | | | | | | | | | | This variable was introduced to help authors override CMake's default platform information before any of it is cached. State this clearly in the documentation. Explicitly discourage use for other purposes.
* | Merge topic 'relative-CMAKE_USER_MAKE_RULES_OVERRIDE'Brad King2011-01-264-22/+38
|\ \ | |/ | | | | | | a146e03 Fix relative CMAKE_USER_MAKE_RULES_OVERRIDE (#11725)
| * Fix relative CMAKE_USER_MAKE_RULES_OVERRIDE (#11725)Brad King2011-01-194-22/+38
| | | | | | | | | | | | | | | | | | In commit 295b5b60 (Honor CMAKE_USER_MAKE_RULES_OVERRIDE in try_compile, 2010-06-29) we started passing the value of this variable when building a try_compile project. If the variable contains a relative path it must be treated with respect to the file where it is first used. Ensure that the value is converted to a full path so that it is correctly referenced in the try_compile projects.
* | Merge topic 'enable-using-devenv-as-cmakemakeprogram'Brad King2011-01-261-5/+10
|\ \ | | | | | | | | | | | | 2ca1161 VS10: Enable using devenv as CMAKE_MAKE_PROGRAM (#11459)
| * | VS10: Enable using devenv as CMAKE_MAKE_PROGRAM (#11459)David Cole2011-01-211-5/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If CMAKE_MAKE_PROGRAM is set to devenv, then GenerateBuildCommand uses it just like we used to do for VS8 and VS9. Otherwise, it still uses MSBuild. This will let us run the CMake test suite through devenv and make sure all the solution and project files we generate are load-able and build-able by the VS 2010 IDE, not just MSBuild. Inspired-By: Robert Lenhardt
* | | Merge topic 'fix-11147-avoid-vc10-filters-error-msg'Brad King2011-01-261-49/+54
|\ \ \ | | | | | | | | | | | | | | | | 0cde56d VS10: Load projects with obj "source" files (#11147)
| * | | VS10: Load projects with obj "source" files (#11147)David Cole2011-01-211-49/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | WriteCLSources should skip source files with "obj" extensions since WriteObjSources has already written them into the vcxproj file. Likewise, WriteGroupSources should skip source files with "obj" extensions to avoid receiving "item ... already exists under the filter" project-load-time error messages from Visual Studio.
* | | | Merge topic 'dev/add_test-working-directory'Brad King2011-01-263-2/+40
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d94f9c6 Only set the property if the property was given b6c302b Default the working dir to the current binary dir 0594287 Add more tests for WorkingDirectory for tests
| * | | | Only set the property if the property was givenBen Boeckel2011-01-201-5/+6
| | | | |
| * | | | Default the working dir to the current binary dirBen Boeckel2011-01-201-2/+4
| | | | | | | | | | | | | | | | | | | | Keep backwards compatability with CMake <= 2.8.3.
| * | | | Add more tests for WorkingDirectory for testsBen Boeckel2011-01-202-1/+36
| | | | |
* | | | | Merge topic 'use-own-FindPackageHandleStandardArgs'Brad King2011-01-2688-88/+91
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | c427559 Modules: Include builtin FindPackageHandleStandardArgs directly
| * | | | | Modules: Include builtin FindPackageHandleStandardArgs directlyBrad King2011-01-2088-88/+91
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The FindPackageHandleStandardArgs module was originally created outside of CMake. It was added for CMake 2.6.0 by commit e118a627 (add a macro FIND_PACKAGE_HANDLE_STANDARD_ARGS..., 2007-07-18). However, it also proliferated into a number of other projects that at the time required only CMake 2.4 and thus could not depend on CMake to provide the module. CMake's own find modules started using the module in commit b5f656e0 (use the new FIND_PACKAGE_HANDLE_STANDARD_ARGS in some of the FindXXX modules..., 2007-07-18). Then commit d358cf5c (add 2nd, more powerful mode to find_package_handle_standard_args, 2010-07-29) added a new feature to the interface of the module that was fully optional and backward compatible with all existing users of the module. Later commit 5f183caa (FindZLIB: use the FPHSA version mode, 2010-08-04) and others shortly thereafter started using the new interface in CMake's own find modules. This change was also backward compatible because it was only an implementation detail within each module. Unforutnately these changes introduced a problem for projects that still have an old copy of FindPackageHandleStandardArgs in CMAKE_MODULE_PATH. When any such project uses one of CMake's builtin find modules the line include(FindPackageHandleStandardArgs) loads the copy from the project which does not have the new interface! Then the including find module tries to use the new interface with the old module and fails. Whether this breakage can be considered a backward incompatible change in CMake is debatable. The situation is analagous to copying a standard library header from one version of a compiler into a project and then observing problems when the next version of the compiler reports errors in its other headers that depend on its new version of the original header. Nevertheless it is a change to CMake that causes problems for projects that worked with previous versions. This problem was discovered during the 2.8.3 release candidate cycle. It is an instance of a more general problem with projects that provide their own versions of CMake modules when other CMake modules depend on them. At the time we resolved this instance of the problem with commit b0118402 (Use absolute path to FindPackageHandleStandardArgs.cmake everywhere, 2010-09-28) for the 2.8.3 release. In order to address the more general problem we introduced policy CMP0017 in commit db44848f (Prefer files from CMAKE_ROOT when including from CMAKE_ROOT, 2010-11-17). That change was followed by commit ce28737c (Remove usage of CMAKE_CURRENT_LIST_DIR now that we have CMP0017, 2010-12-20) which reverted the original workaround in favor of using the policy. However, existing project releases do not set the policy behavior to NEW and therefore still exhibit the problem. We introduced in commit a364daf1 (Allow users to specify defaults for unset policies, 2011-01-03) an option for users to build existing projects by adding -DCMAKE_POLICY_DEFAULT_CMP0017=NEW to the command line. Unfortunately this solution still does not allow such projects to build out of the box, and there is no good way to suggest the use of the new option. The only remaining solution to keep existing projects that exhibit this problem building is to restore the change originally made in commit b0118402 (Use absolute path to FindPackageHandleStandardArgs.cmake everywhere, 2010-09-28). This also avoids policy CMP0017 warnings for this particular instance of the problem the policy addresses.
* | | | | | Merge topic 'fix-try_compile-source-language-issue-11731'Brad King2011-01-261-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 699a725 Use shortest extension to verify try_compile language (#11731)
| * | | | | | Use shortest extension to verify try_compile language (#11731)Brad King2011-01-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the source-file form of try_compile is given a file name with multiple '.' characters such as "a.b.c" use only the shortest extension to check the language. This is the expected behavior and is consistent with normal language extension determination in the method cmSourceFileLocation::UpdateExtension.
* | | | | | | Merge topic 'improve-try_compile-error-messages'Brad King2011-01-261-36/+32
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | 1bee6b1 Improve try_compile and try_run error messages
| * | | | | | Improve try_compile and try_run error messagesBrad King2011-01-201-36/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Use IssueMessage to give the messages context and better formatting.
* | | | | | | Merge topic 'fix-11668-ccmake-resize-crash'Brad King2011-01-261-21/+24
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 693c9a6 Avoid exceptions when ccmake terminal window is too small (#11668)
| * | | | | | | Avoid exceptions when ccmake terminal window is too small (#11668)David Cole2011-01-191-21/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Thanks to Nicolas Despres for the patch.
* | | | | | | | KWSys Nightly Date StampKWSys Robot2011-01-261-1/+1
| | | | | | | |
* | | | | | | | KWSys Nightly Date StampKWSys Robot2011-01-251-1/+1
| | | | | | | |
* | | | | | | | KWSys Nightly Date StampKWSys Robot2011-01-241-1/+1
| | | | | | | |
* | | | | | | | KWSys Nightly Date StampKWSys Robot2011-01-231-1/+1
| | | | | | | |
* | | | | | | | KWSys Nightly Date StampKWSys Robot2011-01-221-1/+1
| |_|_|_|_|/ / |/| | | | | |
* | | | | | | KWSys Nightly Date StampKWSys Robot2011-01-211-1/+1
| |_|/ / / / |/| | | | |
* | | | | | KWSys Nightly Date StampKWSys Robot2011-01-201-1/+1
| | | | | |
* | | | | | Merge topic 'depend-scan-backslash-issue-10281'Brad King2011-01-191-0/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8dc7501 Normalize slashes in scanned #include lines (#10281)
| * | | | | | Normalize slashes in scanned #include lines (#10281)Brad King2011-01-171-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On Windows platforms source files may contain '\' in include directives: #include "a\b.h" Normalize these while scanning to use forward slashes. CMake will convert from forward slashes to the direction preferred by the native build tools when writing the path to 'depend.make' files.
* | | | | | | Merge topic 'vs-Fortran-SCC-issue-10237'Brad King2011-01-192-11/+19
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9859c64 Honor VS_SCC_* properties in Fortran targets (#10237)
| * | | | | | | Honor VS_SCC_* properties in Fortran targets (#10237)Brad King2011-01-172-11/+19
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Factor out generation of SccProjectName, SccLocalPath, and SccProvider from cmLocalVisualStudio7Generator::WriteProjectStart and call it from cmLocalVisualStudio7Generator::WriteProjectStartFortran too.
* | | | | | | Merge topic 'try_compile-Makefile-config'Brad King2011-01-194-2/+27
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 052c2ae Document CMAKE_TRY_COMPILE_CONFIGURATION variable 56efc60 Honor CMAKE_TRY_COMPILE_CONFIGURATION in Makefile generators (#10809)
| * | | | | | | Document CMAKE_TRY_COMPILE_CONFIGURATION variableBrad King2011-01-173-2/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also reference it from try_compile and try_run since it affects those commands.
| * | | | | | | Honor CMAKE_TRY_COMPILE_CONFIGURATION in Makefile generators (#10809)Brad King2011-01-171-0/+12
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously this was used only in multi-configuration generators to choose the configuration of try_compile and try_run at their build time. Teach CMake to honor the variable in single-configuration generators as the CMAKE_BUILD_TYPE.
* | | | | | | Merge topic 'fix-find-png-zlib'Brad King2011-01-192-2/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 30e19b7 Add new names for PNG and ZLIB libraries
| * | | | | | | Add new names for PNG and ZLIB librariesDavid Cole2011-01-142-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Thanks to Pau Garcia i Quiles for the patch on the CMake mailing list.
* | | | | | | | Merge topic 'fix-10031-add-freeglut'Brad King2011-01-191-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | efd1d9c Add freeglut as library name (#10031)
| * | | | | | | | Add freeglut as library name (#10031)David Cole2011-01-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Thanks to Thomas Sondergaard for the patch in the bug report.
* | | | | | | | | Merge topic 'qt4-query-exec-process'Brad King2011-01-191-1/+4
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 858fe0e Replace exec_program with execute_process for qmake queries.
| * | | | | | | | | Replace exec_program with execute_process for qmake queries.Clinton Stimpson2011-01-181-1/+4
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge topic 'sco-compiler'Brad King2011-01-196-3/+35
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e60c8ec Factor SCO compiler info out of platform file (#11700) db05da3 Recognize SCO UnixWare C/C++ compilers (#11700)
| * | | | | | | | | Factor SCO compiler info out of platform file (#11700)Brad King2011-01-174-3/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move these flags out of the SCO_SV platform file so that other compilers may be used on that platform without interference.
| * | | | | | | | | Recognize SCO UnixWare C/C++ compilers (#11700)Brad King2011-01-172-0/+6
| | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These compilers define __SCO_VERSION__ as VvvYYYYMML: V = major version vv = minor version YYYY = release year MM = release month http://osr600doc.sco.com/en/manCP/cc.CP.html http://osr600doc.sco.com/en/manCP/CC.CP.html
* | | | | | | | | Merge topic 'xcode-subdir-regen-dependencies'Brad King2011-01-192-4/+13
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 809ef30 Xcode: Make generation depend on all input directories
| * | | | | | | | | Xcode: Make generation depend on all input directoriesBrad King2011-01-132-4/+13
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously the Xcode generator would rerun CMake only if input file dependencies in the top-level directory changed. Teach it to depend on input files from all directories. Other generators already do this. Reported-by: Johan Björk <phb@spotify.com>
* | | | | | | | | Merge topic 'linux-standard-base'Brad King2011-01-191-2/+6
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cf5ad18 libarchive: Fix major() check for LSB 4.0 (#11648)
generated by cgit v0.12 at 2024-11-13 22:24:49 (GMT)