This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via 457cf2d45d9375dc0d364afe3162495f810546d5 (commit)
via dcf6cf407a9b5478b811902d5a902f35083ac0c5 (commit)
from c4cf702d727cb140986b2c21e67470457849f791 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=457cf2d45d9375dc0d364afe3162495f810546d5
commit 457cf2d45d9375dc0d364afe3162495f810546d5
Merge: c4cf702 dcf6cf4
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Wed Aug 13 10:07:15 2014 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Wed Aug 13 10:07:15 2014 -0400
Merge topic 'vs-masm' into next
dcf6cf40 Revert topic 'vs-masm'
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=dcf6cf407a9b5478b811902d5a902f35083ac0c5
commit dcf6cf407a9b5478b811902d5a902f35083ac0c5
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Wed Aug 13 10:08:28 2014 -0400
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Wed Aug 13 10:08:28 2014 -0400
Revert topic 'vs-masm'
It needs to be revised for the VS flag table support.
diff --git a/Source/cmGlobalVisualStudio10Generator.cxx
b/Source/cmGlobalVisualStudio10Generator.cxx
index 19aa52c..c708a08 100644
--- a/Source/cmGlobalVisualStudio10Generator.cxx
+++ b/Source/cmGlobalVisualStudio10Generator.cxx
@@ -99,6 +99,7 @@
cmGlobalVisualStudio10Generator::cmGlobalVisualStudio10Generator(
"ProductDir", vc10Express, cmSystemTools::KeyWOW64_32);
this->SystemIsWindowsPhone = false;
this->SystemIsWindowsStore = false;
+ this->MasmEnabled = false;
this->MSBuildCommandInitialized = false;
}
@@ -256,6 +257,15 @@ void cmGlobalVisualStudio10Generator
::EnableLanguage(std::vector<std::string>const & lang,
cmMakefile *mf, bool optional)
{
+ for(std::vector<std::string>::const_iterator it = lang.begin();
+ it != lang.end(); ++it)
+ {
+ if(*it == "ASM_MASM")
+ {
+ this->MasmEnabled = true;
+ }
+ }
+
cmGlobalVisualStudio8Generator::EnableLanguage(lang, mf, optional);
}
diff --git a/Source/cmGlobalVisualStudio10Generator.h
b/Source/cmGlobalVisualStudio10Generator.h
index 11fa954..6245b28 100644
--- a/Source/cmGlobalVisualStudio10Generator.h
+++ b/Source/cmGlobalVisualStudio10Generator.h
@@ -58,6 +58,9 @@ public:
/** Is the installed VS an Express edition? */
bool IsExpressEdition() const { return this->ExpressEdition; }
+ /** Is the Microsoft Assembler enabled? */
+ bool IsMasmEnabled() const { return this->MasmEnabled; }
+
/** The toolset name for the target platform. */
const char* GetPlatformToolset() const;
@@ -120,6 +123,7 @@ protected:
bool SystemIsWindowsPhone;
bool SystemIsWindowsStore;
bool ExpressEdition;
+ bool MasmEnabled;
bool UseFolderProperty();
diff --git a/Source/cmGlobalVisualStudio7Generator.cxx
b/Source/cmGlobalVisualStudio7Generator.cxx
index e312ff1..3d79357 100644
--- a/Source/cmGlobalVisualStudio7Generator.cxx
+++ b/Source/cmGlobalVisualStudio7Generator.cxx
@@ -23,7 +23,6 @@
cmGlobalVisualStudio7Generator::cmGlobalVisualStudio7Generator(
{
this->IntelProjectVersion = 0;
this->DevEnvCommandInitialized = false;
- this->MasmEnabled = false;
if (platformName.empty())
{
diff --git a/Source/cmGlobalVisualStudio7Generator.h
b/Source/cmGlobalVisualStudio7Generator.h
index 7e3ed23..390b97c 100644
--- a/Source/cmGlobalVisualStudio7Generator.h
+++ b/Source/cmGlobalVisualStudio7Generator.h
@@ -102,9 +102,6 @@ public:
virtual void FindMakeProgram(cmMakefile*);
- /** Is the Microsoft Assembler enabled? */
- bool IsMasmEnabled() const { return this->MasmEnabled; }
-
// Encoding for Visual Studio files
virtual std::string Encoding();
@@ -176,7 +173,6 @@ protected:
// There is one SLN file per project.
std::string CurrentProject;
std::string PlatformName;
- bool MasmEnabled;
private:
char* IntelProjectVersion;
diff --git a/Source/cmGlobalVisualStudio8Generator.cxx
b/Source/cmGlobalVisualStudio8Generator.cxx
index c91730f..6bfef68 100644
--- a/Source/cmGlobalVisualStudio8Generator.cxx
+++ b/Source/cmGlobalVisualStudio8Generator.cxx
@@ -136,14 +136,6 @@ void cmGlobalVisualStudio8Generator
::EnableLanguage(std::vector<std::string>const & lang,
cmMakefile *mf, bool optional)
{
- for(std::vector<std::string>::const_iterator it = lang.begin();
- it != lang.end(); ++it)
- {
- if(*it == "ASM_MASM")
- {
- this->MasmEnabled = true;
- }
- }
this->AddPlatformDefinitions(mf);
cmGlobalVisualStudio7Generator::EnableLanguage(lang, mf, optional);
}
diff --git a/Source/cmLocalVisualStudio7Generator.cxx
b/Source/cmLocalVisualStudio7Generator.cxx
index d2b2bf7..3ed4a48 100644
--- a/Source/cmLocalVisualStudio7Generator.cxx
+++ b/Source/cmLocalVisualStudio7Generator.cxx
@@ -862,14 +862,6 @@ void
cmLocalVisualStudio7Generator::WriteConfiguration(std::ostream& fout,
}
}
fout << "/>\n"; // end of <Tool Name=VCCLCompilerTool
- if(gg->IsMasmEnabled() && !this->FortranProject)
- {
- fout <<
- "\t\t\t<Tool\n"
- "\t\t\t\tName=\"MASM\"\n"
- "\t\t\t/>\n"
- ;
- }
tool = "VCCustomBuildTool";
if(this->FortranProject)
{
@@ -1703,12 +1695,11 @@ bool cmLocalVisualStudio7Generator
else if(!fcinfo.FileConfigMap.empty())
{
const char* aCompilerTool = "VCCLCompilerTool";
- const char* ppLang = "CXX";
+ const char* lang = "CXX";
if(this->FortranProject)
{
aCompilerTool = "VFFortranCompilerTool";
}
- std::string const& lang = (*sf)->GetLanguage();
std::string ext = (*sf)->GetExtension();
ext = cmSystemTools::LowerCase(ext);
if(ext == "idl")
@@ -1722,7 +1713,7 @@ bool cmLocalVisualStudio7Generator
if(ext == "rc")
{
aCompilerTool = "VCResourceCompilerTool";
- ppLang = "RC";
+ lang = "RC";
if(this->FortranProject)
{
aCompilerTool = "VFResourceCompilerTool";
@@ -1736,11 +1727,6 @@ bool cmLocalVisualStudio7Generator
aCompilerTool = "VFCustomBuildTool";
}
}
- if (gg->IsMasmEnabled() && !this->FortranProject &&
- lang == "ASM_MASM")
- {
- aCompilerTool = "MASM";
- }
for(std::map<std::string, cmLVS7GFileConfig>::const_iterator
fci = fcinfo.FileConfigMap.begin();
fci != fcinfo.FileConfigMap.end(); ++fci)
@@ -1777,7 +1763,7 @@ bool cmLocalVisualStudio7Generator
fileOptions.OutputFlagMap(fout, "\t\t\t\t\t");
fileOptions.OutputPreprocessorDefinitions(fout,
"\t\t\t\t\t", "\n",
- ppLang);
+ lang);
}
if(!fc.AdditionalDeps.empty())
{
@@ -2109,16 +2095,6 @@
cmLocalVisualStudio7Generator::WriteProjectStart(std::ostream& fout,
<< "\t<Platforms>\n"
<< "\t\t<Platform\n\t\t\tName=\"" << gg->GetPlatformName() << "\"/>\n"
<< "\t</Platforms>\n";
- if(gg->IsMasmEnabled())
- {
- fout <<
- "\t<ToolFiles>\n"
- "\t\t<DefaultToolFile\n"
- "\t\t\tFileName=\"masm.rules\"\n"
- "\t\t/>\n"
- "\t</ToolFiles>\n"
- ;
- }
}
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx
b/Source/cmVisualStudio10TargetGenerator.cxx
index 108a24b..291827a 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -1123,7 +1123,7 @@ void cmVisualStudio10TargetGenerator::WriteAllSources()
{
tool = "ClCompile";
}
- else if (lang == "ASM_MASM" &&
+ else if (lang == "ASM_NASM" &&
this->GlobalGenerator->IsMasmEnabled())
{
tool = "MASM";
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 691e503..ca7fcdc 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -1679,11 +1679,6 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P
${CMake_SOURCE_DIR}/Utilities/Release
list(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/MFC")
endif()
- if(MSVC AND CMAKE_SIZEOF_VOID_P EQUAL 4
- AND NOT MSVC60 AND NOT CMAKE_GENERATOR MATCHES "Visual Studio [67]( |$)")
- ADD_TEST_MACRO(VSMASM VSMASM)
- endif()
-
if(${CMAKE_GENERATOR} MATCHES "Visual Studio")
if(NOT MSVC60)
ADD_TEST_MACRO(SBCS SBCS)
diff --git a/Tests/VSMASM/CMakeLists.txt b/Tests/VSMASM/CMakeLists.txt
deleted file mode 100644
index 62e818d..0000000
--- a/Tests/VSMASM/CMakeLists.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-cmake_minimum_required(VERSION 2.8.12)
-project(VSMASM C ASM_MASM)
-if(NOT CMAKE_SIZEOF_VOID_P EQUAL 4)
- message(FATAL_ERROR "This test works only with i386 architecture.")
-endif()
-add_executable(VSMASM main.c foo.asm)
diff --git a/Tests/VSMASM/foo.asm b/Tests/VSMASM/foo.asm
deleted file mode 100644
index 2a4519c..0000000
--- a/Tests/VSMASM/foo.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-.386
-.model flat, c
-.code
-foo proc public
- mov eax,0
- ret
-foo endp
-end
diff --git a/Tests/VSMASM/main.c b/Tests/VSMASM/main.c
deleted file mode 100644
index 570ba16..0000000
--- a/Tests/VSMASM/main.c
+++ /dev/null
@@ -1,2 +0,0 @@
-extern int foo(void);
-int main(void) { return foo(); }
-----------------------------------------------------------------------
Summary of changes:
Source/cmGlobalVisualStudio10Generator.cxx | 10 ++++++++++
Source/cmGlobalVisualStudio10Generator.h | 4 ++++
Source/cmGlobalVisualStudio7Generator.cxx | 1 -
Source/cmGlobalVisualStudio7Generator.h | 4 ----
Source/cmGlobalVisualStudio8Generator.cxx | 8 --------
Source/cmLocalVisualStudio7Generator.cxx | 30 +++-------------------------
Source/cmVisualStudio10TargetGenerator.cxx | 2 +-
Tests/CMakeLists.txt | 5 -----
Tests/VSMASM/CMakeLists.txt | 6 ------
Tests/VSMASM/foo.asm | 8 --------
Tests/VSMASM/main.c | 2 --
11 files changed, 18 insertions(+), 62 deletions(-)
delete mode 100644 Tests/VSMASM/CMakeLists.txt
delete mode 100644 Tests/VSMASM/foo.asm
delete mode 100644 Tests/VSMASM/main.c
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
