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 6e354771a8f8a7ec95e878eb658a56800b6c8639 (commit) via df3b007d7f904f8de5877f3e05b629239af7220a (commit) from bc419fa05ee44b12ace8db8dd1eab1615eaf82d4 (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=6e354771a8f8a7ec95e878eb658a56800b6c8639 commit 6e354771a8f8a7ec95e878eb658a56800b6c8639 Merge: bc419fa df3b007 Author: Brad King <brad.k...@kitware.com> AuthorDate: Wed Aug 20 10:20:49 2014 -0400 Commit: CMake Topic Stage <kwro...@kitware.com> CommitDate: Wed Aug 20 10:20:49 2014 -0400 Merge topic 'vs-masm' into next df3b007d VS: Add test for MASM support http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=df3b007d7f904f8de5877f3e05b629239af7220a commit df3b007d7f904f8de5877f3e05b629239af7220a Author: Brad King <brad.k...@kitware.com> AuthorDate: Thu Aug 7 14:53:57 2014 -0400 Commit: Brad King <brad.k...@kitware.com> CommitDate: Wed Aug 20 10:19:49 2014 -0400 VS: Add test for MASM support It is now expected to work with VS >= 10 and MSVC >= 13.1. diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt index ca7fcdc..f237f21 100644 --- a/Tests/CMakeLists.txt +++ b/Tests/CMakeLists.txt @@ -1679,6 +1679,11 @@ ${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 NOT MSVC_VERSION LESS 1310 + AND NOT CMAKE_GENERATOR MATCHES "Visual Studio [6789]( |$)") + 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 new file mode 100644 index 0000000..f2570a3 --- /dev/null +++ b/Tests/VSMASM/CMakeLists.txt @@ -0,0 +1,10 @@ +cmake_minimum_required(VERSION 2.8.12) +project(VSMASM C ASM_MASM) +if(CMAKE_SIZEOF_VOID_P EQUAL 8) + add_definitions(-DTESTx64) +else() + add_definitions(-DTESTi386) + set(CMAKE_ASM_MASM_FLAGS "${CMAKE_ASM_MASM_FLAGS} /safeseh") +endif() +include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include) +add_executable(VSMASM main.c foo.asm) diff --git a/Tests/VSMASM/foo.asm b/Tests/VSMASM/foo.asm new file mode 100644 index 0000000..51cb969 --- /dev/null +++ b/Tests/VSMASM/foo.asm @@ -0,0 +1,7 @@ +ifndef TESTx64 +.386 +.model flat, c +endif +.code +include <foo-proc.asm> +end diff --git a/Tests/VSMASM/include/foo-proc.asm b/Tests/VSMASM/include/foo-proc.asm new file mode 100644 index 0000000..e8ba5dc --- /dev/null +++ b/Tests/VSMASM/include/foo-proc.asm @@ -0,0 +1,4 @@ +foo proc public + mov eax,0 + ret +foo endp diff --git a/Tests/VSMASM/main.c b/Tests/VSMASM/main.c new file mode 100644 index 0000000..570ba16 --- /dev/null +++ b/Tests/VSMASM/main.c @@ -0,0 +1,2 @@ +extern int foo(void); +int main(void) { return foo(); } ----------------------------------------------------------------------- Summary of changes: hooks/post-receive -- CMake _______________________________________________ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits