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, master has been updated via ee3295e91740033ebe9d9a0c800c0a3070108624 (commit) via 5ba2c9e5e08cb391c366065210a95a46ac74f310 (commit) from 0a30938848518a0e5095a5dd7e4739922a78b743 (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 ----------------------------------------------------------------- https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ee3295e91740033ebe9d9a0c800c0a3070108624 commit ee3295e91740033ebe9d9a0c800c0a3070108624 Merge: 0a30938 5ba2c9e Author: Brad King <brad.k...@kitware.com> AuthorDate: Fri Feb 10 13:36:18 2017 -0500 Commit: CMake Topic Stage <kwro...@kitware.com> CommitDate: Fri Feb 10 13:36:18 2017 -0500 Merge topic 'vs-nasm' 5ba2c9e5 VS: Add support for ASM_NASM language diff --cc Modules/CMakeDetermineASMCompiler.cmake index 3f18a8c,66bf14b..7d5e2b2 --- a/Modules/CMakeDetermineASMCompiler.cmake +++ b/Modules/CMakeDetermineASMCompiler.cmake @@@ -92,9 -92,17 +92,17 @@@ if(NOT CMAKE_ASM${ASM_DIALECT}_COMPILER set(CMAKE_ASM${ASM_DIALECT}_COMPILER_ID_VENDOR_FLAGS_ARMCC ) set(CMAKE_ASM${ASM_DIALECT}_COMPILER_ID_VENDOR_REGEX_ARMCC "(ARM Compiler)|(ARM Assembler)") + list(APPEND CMAKE_ASM${ASM_DIALECT}_COMPILER_ID_VENDORS NASM) + set(CMAKE_ASM${ASM_DIALECT}_COMPILER_ID_VENDOR_FLAGS_NASM "-v") + set(CMAKE_ASM${ASM_DIALECT}_COMPILER_ID_VENDOR_REGEX_NASM "(NASM version)") + + list(APPEND CMAKE_ASM${ASM_DIALECT}_COMPILER_ID_VENDORS YASM) + set(CMAKE_ASM${ASM_DIALECT}_COMPILER_ID_VENDOR_FLAGS_YASM "--version") + set(CMAKE_ASM${ASM_DIALECT}_COMPILER_ID_VENDOR_REGEX_YASM "(yasm)") + include(CMakeDetermineCompilerId) - CMAKE_DETERMINE_COMPILER_ID_VENDOR(ASM${ASM_DIALECT}) - + set(userflags) + CMAKE_DETERMINE_COMPILER_ID_VENDOR(ASM${ASM_DIALECT} "${userflags}") endif() if(CMAKE_ASM${ASM_DIALECT}_COMPILER_ID) ----------------------------------------------------------------------- Summary of changes: Help/release/dev/vs-nasm.rst | 5 ++ Modules/CMakeDetermineASMCompiler.cmake | 8 ++ Modules/CMakeDetermineASM_NASMCompiler.cmake | 17 +++- Source/cmGlobalVisualStudio10Generator.cxx | 14 ++++ Source/cmGlobalVisualStudio10Generator.h | 2 + Source/cmGlobalVisualStudio7Generator.cxx | 1 + Source/cmGlobalVisualStudio7Generator.h | 2 + Source/cmVS10NASMFlagTable.h | 50 ++++++++++++ Source/cmVisualStudio10TargetGenerator.cxx | 105 ++++++++++++++++++++++++ Source/cmVisualStudio10TargetGenerator.h | 9 ++- Source/cmVisualStudio10ToolsetOptions.cxx | 1 + Source/cmVisualStudioGeneratorOptions.h | 1 + Templates/MSBuild/nasm.props.in | 17 ++++ Templates/MSBuild/nasm.targets | 41 ++++++++++ Templates/MSBuild/nasm.xml | 110 ++++++++++++++++++++++++++ Tests/CMakeLists.txt | 7 +- Tests/{VSMASM => VSNASM}/CMakeLists.txt | 6 +- Tests/VSNASM/foo.asm | 7 ++ Tests/VSNASM/include/foo-proc.asm | 7 ++ Tests/{VSMASM => VSNASM}/main.c | 0 20 files changed, 403 insertions(+), 7 deletions(-) create mode 100644 Help/release/dev/vs-nasm.rst create mode 100644 Source/cmVS10NASMFlagTable.h create mode 100644 Templates/MSBuild/nasm.props.in create mode 100644 Templates/MSBuild/nasm.targets create mode 100644 Templates/MSBuild/nasm.xml copy Tests/{VSMASM => VSNASM}/CMakeLists.txt (63%) create mode 100644 Tests/VSNASM/foo.asm create mode 100644 Tests/VSNASM/include/foo-proc.asm copy Tests/{VSMASM => VSNASM}/main.c (100%) hooks/post-receive -- CMake _______________________________________________ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits