diff options
| author | Brad King <brad.king@kitware.com> | 2015-02-17 15:09:13 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2015-02-17 15:09:13 (GMT) |
| commit | 5c635fa62414c408d04046079a5c0dac43f7cce2 (patch) | |
| tree | 6a7e7faf97d0fe5e152bd1501a5432c01c5a8c8a /Help | |
| parent | 034f8e0bd9a2b8a319fead5042ee5782a0df03fd (diff) | |
| parent | fa8b30ebb57da8ddc3e3616c4d212811abc19335 (diff) | |
| download | CMake-5c635fa62414c408d04046079a5c0dac43f7cce2.zip CMake-5c635fa62414c408d04046079a5c0dac43f7cce2.tar.gz CMake-5c635fa62414c408d04046079a5c0dac43f7cce2.tar.bz2 | |
Merge topic 'vs7-OutputDirectory'
fa8b30eb VS: Fix .vcproj and .vfproj file OutputDirectory generation
aa2ba121 VS: Use $(ConfigurationName) as CMAKE_CFG_INTDIR in VS 7, 8, 9
Diffstat (limited to 'Help')
| -rw-r--r-- | Help/release/dev/vs7-OutputDirectory.rst | 10 | ||||
| -rw-r--r-- | Help/variable/CMAKE_CFG_INTDIR.rst | 10 |
2 files changed, 15 insertions, 5 deletions
diff --git a/Help/release/dev/vs7-OutputDirectory.rst b/Help/release/dev/vs7-OutputDirectory.rst new file mode 100644 index 0000000..2725d0c --- /dev/null +++ b/Help/release/dev/vs7-OutputDirectory.rst @@ -0,0 +1,10 @@ +vs7-OutputDirectory +------------------- + +* The :variable:`CMAKE_CFG_INTDIR` variable value for Visual Studio + 7, 8, and 9 is now ``$(ConfigurationName)`` instead of ``$(OutDir)``. + This should have no effect on the intended use cases of the variable. + +* With Visual Studio 7, 8, and 9 generators the value of the ``$(OutDir)`` + placeholder no longer evaluates to the configuration name. Projects + should use ``$(ConfigurationName)`` for that instead. diff --git a/Help/variable/CMAKE_CFG_INTDIR.rst b/Help/variable/CMAKE_CFG_INTDIR.rst index 20435e5..55f7b01 100644 --- a/Help/variable/CMAKE_CFG_INTDIR.rst +++ b/Help/variable/CMAKE_CFG_INTDIR.rst @@ -12,11 +12,11 @@ values: :: - $(IntDir) = Visual Studio 6 - $(OutDir) = Visual Studio 7, 8, 9 - $(Configuration) = Visual Studio 10 - $(CONFIGURATION) = Xcode - . = Make-based tools + $(IntDir) = Visual Studio 6 + $(ConfigurationName) = Visual Studio 7, 8, 9 + $(Configuration) = Visual Studio 10 + $(CONFIGURATION) = Xcode + . = Make-based tools Since these values are evaluated by the native build system, this variable is suitable only for use in command lines that will be |