diff options
| -rw-r--r-- | Help/release/dev/0-sample-topic.rst | 7 | ||||
| -rw-r--r-- | Help/release/index.rst | 2 | ||||
| -rw-r--r-- | Modules/ExternalProject.cmake | 4 | ||||
| -rw-r--r-- | Modules/Platform/Apple-Clang-ASM.cmake | 2 | ||||
| -rw-r--r-- | Source/CMakeVersion.cmake | 6 | ||||
| -rw-r--r-- | Source/cmLocalVisualStudio7Generator.cxx | 4 |
6 files changed, 11 insertions, 14 deletions
diff --git a/Help/release/dev/0-sample-topic.rst b/Help/release/dev/0-sample-topic.rst deleted file mode 100644 index e4cc01e..0000000 --- a/Help/release/dev/0-sample-topic.rst +++ /dev/null @@ -1,7 +0,0 @@ -0-sample-topic --------------- - -* This is a sample release note for the change in a topic. - Developers should add similar notes for each topic branch - making a noteworthy change. Each document should be named - and titled to match the topic name to avoid merge conflicts. diff --git a/Help/release/index.rst b/Help/release/index.rst index a4585a5..0cc3f97 100644 --- a/Help/release/index.rst +++ b/Help/release/index.rst @@ -7,8 +7,6 @@ CMake Release Notes This file should include the adjacent "dev.txt" file in development versions but not in release versions. -.. include:: dev.txt - Releases ======== diff --git a/Modules/ExternalProject.cmake b/Modules/ExternalProject.cmake index e55ed46..66061a1 100644 --- a/Modules/ExternalProject.cmake +++ b/Modules/ExternalProject.cmake @@ -49,7 +49,7 @@ External Project Definition ``STAMP_DIR <dir>`` Directory in which to store the timestamps of each step. Log files from - individual steps are also created in here unless overriden by LOG_DIR + individual steps are also created in here unless overridden by LOG_DIR (see *Logging Options* below). ``LOG_DIR <dir>`` @@ -425,7 +425,7 @@ External Project Definition build directory or re-uses previous build contents. If the CMake generator is the ``Green Hills MULTI`` and not overridden then - the orginal projects settings for the GHS toolset and target system + the original project's settings for the GHS toolset and target system customization cache variables are propagated into the external project. ``SOURCE_SUBDIR <dir>`` diff --git a/Modules/Platform/Apple-Clang-ASM.cmake b/Modules/Platform/Apple-Clang-ASM.cmake new file mode 100644 index 0000000..935cce9 --- /dev/null +++ b/Modules/Platform/Apple-Clang-ASM.cmake @@ -0,0 +1,2 @@ +include(Platform/Apple-Clang) +__apple_compiler_clang(ASM) diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index bca928e..51a9217 100644 --- a/Source/CMakeVersion.cmake +++ b/Source/CMakeVersion.cmake @@ -1,8 +1,8 @@ # CMake version number components. set(CMake_VERSION_MAJOR 3) -set(CMake_VERSION_MINOR 15) -set(CMake_VERSION_PATCH 20191007) -#set(CMake_VERSION_RC 0) +set(CMake_VERSION_MINOR 16) +set(CMake_VERSION_PATCH 0) +set(CMake_VERSION_RC 0) set(CMake_VERSION_IS_DIRTY 0) # Start with the full version number used in tags. It has no dev info. diff --git a/Source/cmLocalVisualStudio7Generator.cxx b/Source/cmLocalVisualStudio7Generator.cxx index 03fb565..ff1eaec 100644 --- a/Source/cmLocalVisualStudio7Generator.cxx +++ b/Source/cmLocalVisualStudio7Generator.cxx @@ -98,6 +98,10 @@ void cmLocalVisualStudio7Generator::FixGlobalTargets() std::string no_main_dependency; std::string force = cmStrCat(this->GetCurrentBinaryDirectory(), "/CMakeFiles/", l->GetName(), "_force"); + if (cmSourceFile* sf = + this->Makefile->GetOrCreateGeneratedSource(force)) { + sf->SetProperty("SYMBOLIC", "1"); + } if (cmSourceFile* file = this->Makefile->AddCustomCommandToOutput( force.c_str(), no_depends, no_main_dependency, force_commands, " ", 0, true)) { |