summaryrefslogtreecommitdiffstats
path: root/Source/QtDialog/CMakeSetupDialog.h
diff options
context:
space:
mode:
authorClinton Stimpson <clinton@elemtech.com>2007-11-06 00:26:18 (GMT)
committerClinton Stimpson <clinton@elemtech.com>2007-11-06 00:26:18 (GMT)
commita7746624e8e8ac29ea3db21d30746b0e70c7cb1c (patch)
treed0df0682c7f98ac6400cdf49875464515c609d43 /Source/QtDialog/CMakeSetupDialog.h
parentc0108d1e07903af49c136217026a2fca082fbb1f (diff)
downloadCMake-a7746624e8e8ac29ea3db21d30746b0e70c7cb1c.zip
CMake-a7746624e8e8ac29ea3db21d30746b0e70c7cb1c.tar.gz
CMake-a7746624e8e8ac29ea3db21d30746b0e70c7cb1c.tar.bz2
ENH: Replace prompt for generator with combobox in UI.
ENH: Make "Show Advanced" toggle work. ENH: Add regex search capabilities. ENH: Read existing registry entries from MFC CMakeSetup.exe (will save later).
Diffstat (limited to 'Source/QtDialog/CMakeSetupDialog.h')
-rw-r--r--Source/QtDialog/CMakeSetupDialog.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/QtDialog/CMakeSetupDialog.h b/Source/QtDialog/CMakeSetupDialog.h
index d1efcce..e67315a 100644
--- a/Source/QtDialog/CMakeSetupDialog.h
+++ b/Source/QtDialog/CMakeSetupDialog.h
@@ -52,7 +52,7 @@ protected slots:
void setBinaryDirectory(const QString& dir);
void showProgress(const QString& msg, float percent);
void setEnabledState(bool);
- void promptForGenerator();
+ //void promptForGenerator();
protected:
void closeEvent(QCloseEvent*);
yle='width: 0.9%;'/> -rw-r--r--Source/cmVisualStudioGeneratorOptions.cxx1
-rw-r--r--Source/cmake.cxx4
-rw-r--r--Tests/CheckCompilerRelatedVariables/CMakeLists.txt4
-rw-r--r--Tests/RunCMake/GeneratorToolset/RunCMakeTest.cmake4
-rw-r--r--Tests/VSExternalInclude/CMakeLists.txt4
16 files changed, 209 insertions, 9 deletions
diff --git a/Help/generator/Visual Studio 14.rst b/Help/generator/Visual Studio 14.rst
new file mode 100644
index 0000000..7f4fdc3
--- /dev/null
+++ b/Help/generator/Visual Studio 14.rst
@@ -0,0 +1,9 @@
+Visual Studio 14
+----------------
+
+Generates Visual Studio 14 project files.
+
+It is possible to append a space followed by the platform name to
+create project files for a specific target platform. E.g.
+"Visual Studio 14 Win64" will create project files for the
+x64 processor; "Visual Studio 14 ARM" for ARM.
diff --git a/Help/manual/cmake-generators.7.rst b/Help/manual/cmake-generators.7.rst
index 8d0c704..7f5093f 100644
--- a/Help/manual/cmake-generators.7.rst
+++ b/Help/manual/cmake-generators.7.rst
@@ -64,6 +64,7 @@ one may launch CMake from any environment.
/generator/Visual Studio 10 2010
/generator/Visual Studio 11 2012
/generator/Visual Studio 12 2013
+ /generator/Visual Studio 14
/generator/Xcode
Extra Generators
diff --git a/Help/manual/cmake-variables.7.rst b/Help/manual/cmake-variables.7.rst
index df434c5..d0d01a9 100644
--- a/Help/manual/cmake-variables.7.rst
+++ b/Help/manual/cmake-variables.7.rst
@@ -178,6 +178,7 @@ Variables that Describe the System
/variable/MSVC10
/variable/MSVC11
/variable/MSVC12
+ /variable/MSVC14
/variable/MSVC60
/variable/MSVC70
/variable/MSVC71
diff --git a/Help/variable/MSVC14.rst b/Help/variable/MSVC14.rst
new file mode 100644
index 0000000..33c782b
--- /dev/null
+++ b/Help/variable/MSVC14.rst
@@ -0,0 +1,6 @@
+MSVC14
+------
+
+True when using Microsoft Visual C 14.0
+
+Set to true when the compiler is version 14.0 of Microsoft Visual C.
diff --git a/Help/variable/MSVC_VERSION.rst b/Help/variable/MSVC_VERSION.rst
index d74114e..ef3b0b5 100644
--- a/Help/variable/MSVC_VERSION.rst
+++ b/Help/variable/MSVC_VERSION.rst
@@ -3,9 +3,7 @@ MSVC_VERSION
The version of Microsoft Visual C/C++ being used if any.
-Known version numbers are:
-
-::
+Known version numbers are::
1200 = VS 6.0
1300 = VS 7.0
@@ -15,3 +13,4 @@ Known version numbers are:
1600 = VS 10.0
1700 = VS 11.0
1800 = VS 12.0
+ 1900 = VS 14.0
diff --git a/Modules/InstallRequiredSystemLibraries.cmake b/Modules/InstallRequiredSystemLibraries.cmake