summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Revert "cmDefinitions: Don't store parent lookups"Ben Boeckel2014-10-243-24/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 5abfde6cb8a1ae0b2825797eab6c2e9842eb7c49. The behaviors associated with implicit pulldown on variable lookup seriously conflict with the optimizations made in these commits. Basically, since values were copied upon variable lookup, not just on PARENT_SCOPE, coupled with PARENT_SCOPE's behavior based on whether the variable is in the current scope or not causes serious problems with not storing a value for every variable at every scope. The commit changed behavior of the following example, among other cases: function(test_set) set(blah "value2") message("before PARENT_SCOPE blah=${blah}") set(blah ${blah} PARENT_SCOPE) message("after PARENT_SCOPE blah=${blah}") endfunction() set(blah value1) test_set() message("in parent scope, blah=${blah}") Reported-by: Alex Merry <alex.merry@kde.org> Reported-by: Ben Cooksley <bcooksley@kde.org>
* cmDefinitions: Don't store parent lookupsBen Boeckel2014-06-093-10/+24
| | | | | When looking up scopes, it is faster to not store the lookup locally to keep the maps smaller and avoid extra allocations and rebalancing.
* Merge branch 'release'Brad King2014-06-090-0/+0
|\
| * Merge branch 'hpux-libarchive-compile' into releaseBrad King2014-06-091-12/+14
| |\
* | \ Merge topic 'hpux-libarchive-compile'Brad King2014-06-090-0/+0
|\ \ \ | | |/ | |/| | | | | | | 4189a7f9 libarchive: fix compilation on newer HP-UX versions
| * | libarchive: fix compilation on newer HP-UX versionsRolf Eike Beer2014-06-091-12/+14
| |/ | | | | | | | | | | | | Newer HP-UX versions (e.g. 11.31) also offers F_SETTIMES, but with a different struct for the timing information. Suggested-by: Eric Berge <ericmberge@gmail.com>
* | Merge topic 'hpux-libarchive-compile'Brad King2014-06-091-1/+1
|\ \ | | | | | | | | | | | | c1ddd77d libarchive: Fix compilation on Tru64 with F_SETTIMES
| * | libarchive: Fix compilation on Tru64 with F_SETTIMESBrad King2014-06-091-1/+1
| | | | | | | | | | | | | | | The parent commit left a typo in the conditional code path for Tru64. Add the missing '.'.
* | | Merge topic 'WriteCompilerDetectionHeader-deprecated-define'Brad King2014-06-091-10/+52
|\ \ \ | | | | | | | | | | | | | | | | 62863106 WCDH: Add compatibility defines for deprecation.
| * | | WCDH: Add compatibility defines for deprecation.Stephen Kelly2014-06-091-10/+52
| | | |
* | | | Merge topic 'dev/backtrace-performance'Brad King2014-06-0935-226/+236
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 86be733f cmGeneratorExpression: Add workaround for Borland compiler 3495ab0a tests: update unused variable test expected output 2a1b2d84 backtrace: Convert to local paths in IssueMessage a0829205 genex: remove the need for backtraces efc20569 cmake: remove dummy backtraces for IssueMessage d46c650d cmMakefile: return a backtrace
| * | | | cmGeneratorExpression: Add workaround for Borland compilerBrad King2014-06-061-0/+8
| | | | |
| * | | | tests: update unused variable test expected outputBen Boeckel2014-06-051-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | The expected output is now a relative path, not a full path. Update the pass/fail detection accordingly.
| * | | | backtrace: Convert to local paths in IssueMessageBen Boeckel2014-06-0513-22/+66
| | | | | | | | | | | | | | | | | | | | | | | | | This is the only place we care show the FilePath to the user, so defer the expensive relative path calculation until here.
| * | | | genex: remove the need for backtracesBen Boeckel2014-06-0520-125/+117
| | | | | | | | | | | | | | | | | | | | | | | | | Rather than making dummy backtraces and passing them around, just make backtraces optional.
| * | | | cmake: remove dummy backtraces for IssueMessageBen Boeckel2014-06-055-17/+14
| | | | |
| * | | | cmMakefile: return a backtraceBen Boeckel2014-06-0510-69/+38
| | | | | | | | | | | | | | | | | | | | | | | | | This allows backtraces to be fully controlled by the makefile rather than externally (and makes changing how they are manipulated easier).
* | | | | Merge topic 'testRST-no-preprocessor-FILE'Brad King2014-06-092-3/+10
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 218699eb Tests: Fix CMakeLib.testRST for relative __FILE__
| * | | | | Tests: Fix CMakeLib.testRST for relative __FILE__Brad King2014-06-062-3/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pass the test input directory as a runtime argument instead of depending on __FILE__ to locate it.
* | | | | | Merge topic 'hpux-libarchive-compile'Brad King2014-06-091-12/+14
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | 478b1c8b libarchive: fix compilation on newer HP-UX versions
| * | | | | libarchive: fix compilation on newer HP-UX versionsRolf Eike Beer2014-06-091-12/+14
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Newer HP-UX versions (e.g. 11.31) also offers F_SETTIMES, but with a different struct for the timing information. Suggested-by: Eric Berge <ericmberge@gmail.com>
* | | | | Merge topic 'windows-RC-extension'Brad King2014-06-091-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 514c2e3d CMakeRCCompiler: Handle uppercase 'RC' as resource file format extension
| * | | | | CMakeRCCompiler: Handle uppercase 'RC' as resource file format extensionTim Blechmann2014-06-061-1/+1
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | We already match lowercase 'rc'. Add 'RC' too. The latter is listed in other CMake<LANG>Compiler modules as ignored for their languages already. Signed-off-by: Tim Blechmann <tim@klingt.org>
* | | | | Merge topic 'xcode15-fix-RunCMake-TargetSources'Brad King2014-06-093-5/+8
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 0366ba5d Tests: Fix RunCMake.TargetSources on Xcode 1.5
| * | | | | Tests: Fix RunCMake.TargetSources on Xcode 1.5Brad King2014-06-063-5/+8
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Xcode 1.5 does not support multiple configurations. The generator also adds some sources internally that cause extra OriginDebug output. Update the expected output to tolerate it.
* | | | | Merge topic 'FindOpenGL-target'Brad King2014-06-091-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 94770baf FindOpenGL: Fix typo in documented target name
| * | | | | FindOpenGL: Fix typo in documented target nameBrad King2014-06-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We provide "OpenGL::GL", not "OpenGL::OpenGL". Reported-by: Daniel Pfeifer
* | | | | | Merge topic 'fix-ctest-label-regex'Brad King2014-06-094-2/+58
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 887532f0 CTest: Fix combined inclusive/exclusive label regular expressions
| * | | | | | CTest: Fix combined inclusive/exclusive label regular expressionsNils Gladitz2014-06-064-2/+58
| | | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2014-06-091-1/+1
| | | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2014-06-081-1/+1
| | | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2014-06-071-1/+1
| |_|/ / / / |/| | | | |
* | | | | | Merge topic 'FindOpenGL-target'Brad King2014-06-061-0/+40
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | b7804cb6 FindOpenGL: Provide imported targets for GL and GLU
| * | | | | FindOpenGL: Provide imported targets for GL and GLUPhilipp Möller2014-06-051-0/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create OpenGL::GL and OpenGL::GLU imported targets using the locations found.
* | | | | | Merge topic 'xcode-15-string-apis'Brad King2014-06-061-13/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 23dc6aa1 Xcode: Fix single-configuration generation for version 1.5
| * | | | | | Xcode: Fix single-configuration generation for version 1.5Brad King2014-06-051-13/+5
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit 84fdc992 (stringapi: Pass configuration names as strings, 2014-02-09) a few code paths for the Xcode 1.5 single-configuration generator were not updated to use an empty configuration name instead of a NULL pointer when no configuration is specified in CMAKE_BUILD_TYPE. Fix them now.
* | | | | | Merge topic 'compile-OBJECT_FILE_DIR'Brad King2014-06-064-0/+19
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8256ccb7 Add OBJECT_FILE_DIR rule placeholder for compilation lines
| * | | | | | Add OBJECT_FILE_DIR rule placeholder for compilation linesBrad King2014-06-054-0/+19
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some compilers do not offer an option to specify the path to the object file, but rather only to the directory in which to place the object file. See issue 14876 for some examples. Add a new OBJECT_FILE_DIR placeholder to specify the directory containing the object file for the current compilation. This may differ from the main target OBJECT_DIR when the object corresponds to a source in a subdirectory.
* | | | | | Merge topic 'dev/fix-complex-tests'Brad King2014-06-062-0/+16
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7db77a82 tests: allow RelWithDebInfo and MinSizeRel configs to work
| * | | | | | tests: allow RelWithDebInfo and MinSizeRel configs to workBen Boeckel2014-06-052-0/+16
| | |_|_|_|/ | |/| | | |
* | | | | | Merge topic 'watcom-overhaul-notes'Brad King2014-06-062-1/+10
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | 559ae189 Help: Add notes about new OpenWatcom compiler id and versioning
| * | | | | Help: Add notes about new OpenWatcom compiler id and versioningBrad King2014-06-052-1/+10
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2014-06-061-1/+1
|/ / / / /
* | | | | Merge topic 'FindOpenGL-docs'Brad King2014-06-051-18/+24
|\ \ \ \ \ | |/ / / / |/| | / / | | |/ / | |/| | 0496c430 FindOpenGL: Organize and format module documentation
| * | | FindOpenGL: Organize and format module documentationPhilipp Möller2014-06-051-18/+24
| | | |
* | | | Merge topic 'delay-generator-toolset'Brad King2014-06-0521-37/+127
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 528e8af1 Allow a toolchain file to specify a generator toolset 98afb454 VS: Split user- and generator-provided PlatformToolset 3e9f6e36 Xcode: Rename internal variable {Platform => Generator}Toolset
| * | | | Allow a toolchain file to specify a generator toolsetBrad King2014-06-0419-20/+98
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Delay use of CMAKE_GENERATOR_TOOLSET until the CMakeSystem.cmake file has been configured and loaded during the first project() or enable_language() command. This gives the toolchain file named by CMAKE_TOOLCHAIN_FILE a chance to set CMAKE_GENERATOR_TOOLSET. This point is still early enough to set the generator toolset prior to the initialization of any languages that might use the toolset. The cmake::GeneratorToolset member variable remains an indication of what was specified by the -T option or loaded from the cache. It does not need to be updated based on the toolchain file setting. The cmMakefile::TryCompile can still pass cmake::GeneratorToolset into the inner instance because the try-compiled project will do platform and language initialization using the CMakeSystem module configured for the outer project. Extend the RunCMake.GeneratorToolset test with cases that use a toolchain file to set CMAKE_GENERATOR_TOOLSET.
| * | | | VS: Split user- and generator-provided PlatformToolsetBrad King2014-06-044-13/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Divide the cmGlobalVisualStudio10Generator "PlatformToolset" member into two members representing the generator-selected default toolset and the user-specified CMAKE_GENERATOR_TOOLSET value. Prefer the user-specified value, if any, and then fall back to the generator-selected default.
| * | | | Xcode: Rename internal variable {Platform => Generator}ToolsetBrad King2014-06-042-6/+6
| |/ / / | | | | | | | | | | | | The latter matches with CMAKE_GENERATOR_TOOLSET better.
* | | | Merge branch 'release'Brad King2014-06-050-0/+0
|\ \ \ \ | | |_|/ | |/| |
generated by cgit v0.12 at 2025-01-01 12:07:59 (GMT)