summaryrefslogtreecommitdiffstats
path: root/Tests/VSNASM/main.c
diff options
context:
space:
mode:
authorDavid Benjamin <davidben@google.com>2018-06-29 19:54:42 (GMT)
committerDavid Benjamin <davidben@google.com>2018-07-02 22:50:12 (GMT)
commitcb694f8cd65dfb4e73fedcfa04f92c8be7a2bcf6 (patch)
tree1864e4af430fe5f2b33beb0adad881430ba28cdb /Tests/VSNASM/main.c
parent9539985fb215439d3d379f60a381e6102ac49e4b (diff)
downloadCMake-cb694f8cd65dfb4e73fedcfa04f92c8be7a2bcf6.zip
CMake-cb694f8cd65dfb4e73fedcfa04f92c8be7a2bcf6.tar.gz
CMake-cb694f8cd65dfb4e73fedcfa04f92c8be7a2bcf6.tar.bz2
VS: Properly quote arguments in nasm.xml
Most arguments were quoted, but some weren't, causing problems if the arguments contained whitespace. In particular, the _STL_EXTRA_DISABLED_WARNINGS value takes spaces and CMake's NASM support applies all add_definitions lines to NASM. The -D flag is missing quotes, so projects using NASM and setting _STL_EXTRA_DISABLED_WARNINGS break in the Visual Studio generator. Likewise, the -o flag is missing quotes, which means filenames with spaces do not work. (The -U flag is unlikely to need quotes, but include them for consistency.) Extend the existing VSNASM test to cover these cases.
Diffstat (limited to 'Tests/VSNASM/main.c')
-rw-r--r--Tests/VSNASM/main.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/Tests/VSNASM/main.c b/Tests/VSNASM/main.c
index 18ddb78..b1401b6 100644
--- a/Tests/VSNASM/main.c
+++ b/Tests/VSNASM/main.c
@@ -1,5 +1,6 @@
extern int foo(void);
+extern int bar(void);
int main(void)
{
- return foo();
+ return foo() + bar();
}