diff options
Diffstat (limited to 'Help')
| -rw-r--r-- | Help/generator/Visual Studio 10 2010.rst | 2 | ||||
| -rw-r--r-- | Help/generator/Visual Studio 11 2012.rst | 2 | ||||
| -rw-r--r-- | Help/generator/Visual Studio 12 2013.rst | 2 | ||||
| -rw-r--r-- | Help/generator/Visual Studio 14 2015.rst | 2 | ||||
| -rw-r--r-- | Help/generator/Visual Studio 15.rst | 2 | ||||
| -rw-r--r-- | Help/manual/OPTIONS_BUILD.txt | 8 | ||||
| -rw-r--r-- | Help/manual/cmake-modules.7.rst | 1 | ||||
| -rw-r--r-- | Help/module/AndroidTestUtilities.rst | 1 | ||||
| -rw-r--r-- | Help/release/dev/add-android-test-utilities-module.rst | 5 | ||||
| -rw-r--r-- | Help/release/dev/doc-compilers-dropped.rst | 10 |
10 files changed, 27 insertions, 8 deletions
diff --git a/Help/generator/Visual Studio 10 2010.rst b/Help/generator/Visual Studio 10 2010.rst index 77ea9df..c694443 100644 --- a/Help/generator/Visual Studio 10 2010.rst +++ b/Help/generator/Visual Studio 10 2010.rst @@ -4,7 +4,7 @@ Visual Studio 10 2010 Generates Visual Studio 10 (VS 2010) project files. The :variable:`CMAKE_GENERATOR_PLATFORM` variable may be set -to specify a target platform name. +to specify a target platform name (architecture). For compatibility with CMake versions prior to 3.1, one may specify a target platform name optionally at the end of this generator name: diff --git a/Help/generator/Visual Studio 11 2012.rst b/Help/generator/Visual Studio 11 2012.rst index 5fa7f2c..2f1e729 100644 --- a/Help/generator/Visual Studio 11 2012.rst +++ b/Help/generator/Visual Studio 11 2012.rst @@ -4,7 +4,7 @@ Visual Studio 11 2012 Generates Visual Studio 11 (VS 2012) project files. The :variable:`CMAKE_GENERATOR_PLATFORM` variable may be set -to specify a target platform name. +to specify a target platform name (architecture). For compatibility with CMake versions prior to 3.1, one may specify a target platform name optionally at the end of this generator name: diff --git a/Help/generator/Visual Studio 12 2013.rst b/Help/generator/Visual Studio 12 2013.rst index 2c3b119..6e8545b 100644 --- a/Help/generator/Visual Studio 12 2013.rst +++ b/Help/generator/Visual Studio 12 2013.rst @@ -4,7 +4,7 @@ Visual Studio 12 2013 Generates Visual Studio 12 (VS 2013) project files. The :variable:`CMAKE_GENERATOR_PLATFORM` variable may be set -to specify a target platform name. +to specify a target platform name (architecture). For compatibility with CMake versions prior to 3.1, one may specify a target platform name optionally at the end of this generator name: diff --git a/Help/generator/Visual Studio 14 2015.rst b/Help/generator/Visual Studio 14 2015.rst index b35997a..707caf9 100644 --- a/Help/generator/Visual Studio 14 2015.rst +++ b/Help/generator/Visual Studio 14 2015.rst @@ -4,7 +4,7 @@ Visual Studio 14 2015 Generates Visual Studio 14 (VS 2015) project files. The :variable:`CMAKE_GENERATOR_PLATFORM` variable may be set -to specify a target platform name. +to specify a target platform name (architecture). For compatibility with CMake versions prior to 3.1, one may specify a target platform name optionally at the end of this generator name: diff --git a/Help/generator/Visual Studio 15.rst b/Help/generator/Visual Studio 15.rst index 2b9e33a..ae456eb 100644 --- a/Help/generator/Visual Studio 15.rst +++ b/Help/generator/Visual Studio 15.rst @@ -4,7 +4,7 @@ Visual Studio 15 Generates Visual Studio 15 project files. The :variable:`CMAKE_GENERATOR_PLATFORM` variable may be set -to specify a target platform name. +to specify a target platform name (architecture). For compatibility with CMake versions prior to 3.1, one may specify a target platform name optionally at the end of this generator name: diff --git a/Help/manual/OPTIONS_BUILD.txt b/Help/manual/OPTIONS_BUILD.txt index b428a74..fa0e4c1 100644 --- a/Help/manual/OPTIONS_BUILD.txt +++ b/Help/manual/OPTIONS_BUILD.txt @@ -66,10 +66,12 @@ Specify platform name if supported by generator. Some CMake generators support a platform name to be given to the - native build system to choose a compiler or SDK. This is supported only on - specific generators:: + native build system to choose a compiler or SDK. See the + :variable:`CMAKE_GENERATOR_PLATFORM` variable. + This is supported only on specific generators: - Visual Studio >= 8 + * For :ref:`Visual Studio Generators` with VS 2005 and above this + specifies the target architecture. See native build system documentation for allowed platform names. diff --git a/Help/manual/cmake-modules.7.rst b/Help/manual/cmake-modules.7.rst index e905ef4..015e36e 100644 --- a/Help/manual/cmake-modules.7.rst +++ b/Help/manual/cmake-modules.7.rst @@ -14,6 +14,7 @@ All Modules :maxdepth: 1 /module/AddFileDependencies + /module/AndroidTestUtilities /module/BundleUtilities /module/CheckCCompilerFlag /module/CheckCSourceCompiles diff --git a/Help/module/AndroidTestUtilities.rst b/Help/module/AndroidTestUtilities.rst new file mode 100644 index 0000000..e7ec864 --- /dev/null +++ b/Help/module/AndroidTestUtilities.rst @@ -0,0 +1 @@ +.. cmake-module:: ../../Modules/AndroidTestUtilities.cmake diff --git a/Help/release/dev/add-android-test-utilities-module.rst b/Help/release/dev/add-android-test-utilities-module.rst new file mode 100644 index 0000000..998b3cd --- /dev/null +++ b/Help/release/dev/add-android-test-utilities-module.rst @@ -0,0 +1,5 @@ +add-android-test-utilities-module +--------------------------------- + +* A :module:`AndroidTestUtilities` module was added to manage transfer of + test data to an Android device. diff --git a/Help/release/dev/doc-compilers-dropped.rst b/Help/release/dev/doc-compilers-dropped.rst new file mode 100644 index 0000000..0bde632 --- /dev/null +++ b/Help/release/dev/doc-compilers-dropped.rst @@ -0,0 +1,10 @@ +doc-compilers-dropped +--------------------- + +* Support for building CMake itself with some compilers was dropped: + + * Visual Studio 7.1 and 2005 -- superseded by VS 2008 and above + * MinGW.org mingw32 -- superseded by MSYS2 mingw32 and mingw64 + + CMake still supports generating build systems for other projects using + these compilers. |