[Cmake-commits] CMake branch, next, updated. v2.8.11.2-3349-g72b4cb6
Brad King
brad.king at kitware.com
Wed Jul 24 13:29:49 EDT 2013
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 72b4cb63d8ca5a80daabdace7f41a3ed82257406 (commit)
via 65df537e9676347b02cd69fb6517a2ff86cecf27 (commit)
via 56f5c88dfbcda4858fbf5904ffe03356dfa46c72 (commit)
from b2381d50edb6a2b81d235b237ea452ec72ad7fee (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=72b4cb63d8ca5a80daabdace7f41a3ed82257406
commit 72b4cb63d8ca5a80daabdace7f41a3ed82257406
Merge: b2381d5 65df537
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Jul 24 13:29:40 2013 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jul 24 13:29:40 2013 -0400
Merge topic 'compile-defs-debugging' into next
65df537 Revert "Copy the semicolon test from the Preprocess test to CompileDefinitions."
56f5c88 Revert "Differentiate tests."
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=65df537e9676347b02cd69fb6517a2ff86cecf27
commit 65df537e9676347b02cd69fb6517a2ff86cecf27
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Jul 24 13:29:08 2013 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Wed Jul 24 13:29:08 2013 -0400
Revert "Copy the semicolon test from the Preprocess test to CompileDefinitions."
This reverts commit 978b663f1ddcfd8868822038566d206874e62a63.
diff --git a/Tests/CompileDefinitions/CMakeLists.txt b/Tests/CompileDefinitions/CMakeLists.txt
index 12bb835..930d220 100644
--- a/Tests/CompileDefinitions/CMakeLists.txt
+++ b/Tests/CompileDefinitions/CMakeLists.txt
@@ -24,46 +24,3 @@ add_subdirectory(target_prop)
add_subdirectory(add_definitions_command_with_target_prop)
add_executable(CompileDefinitions runtest.c)
-
-if(NOT BORLAND AND NOT "${CMAKE_GENERATOR}" MATCHES "Visual Studio 7$")
- # Borland, VS70 IDE: ;
- # The Borland compiler will simply not accept a non-escaped semicolon
- # on the command line. If it is escaped \; then the escape character
- # shows up in the preprocessing output too.
- #
- # The VS 7.0 IDE separates definitions on semicolons and commas with
- # no regard for quotes. Fortunately VS 7.1 and above are okay.
- set(SEMICOLON "\;")
-endif()
-
-set_property(
- TARGET CompileDefinitions
- APPEND PROPERTY COMPILE_DEFINITIONS
- "SEMICOLON_STRING1=\"foo${SEMICOLON}bar\""
- )
-target_compile_definitions(CompileDefinitions PRIVATE
- "SEMICOLON_STRING2=\"foo${SEMICOLON}bar\""
-)
-add_definitions("-DSEMICOLON_STRING3=\"foo${SEMICOLON}bar\"")
-
-add_library(emptyTarget empty.cpp)
-set_property(
- TARGET emptyTarget
- APPEND PROPERTY COMPILE_DEFINITIONS
- "SEMICOLON_STRING4=\"foo${SEMICOLON}bar\""
- )
-
-get_target_property(_roundtrip emptyTarget COMPILE_DEFINITIONS)
-set_property(
- TARGET CompileDefinitions
- APPEND PROPERTY COMPILE_DEFINITIONS
- "${_roundtrip}"
- )
-
-if (SEMICOLON)
- set_property(
- TARGET CompileDefinitions
- APPEND PROPERTY COMPILE_DEFINITIONS
- TEST_SEMICOLON
- )
-endif()
diff --git a/Tests/CompileDefinitions/empty.cpp b/Tests/CompileDefinitions/empty.cpp
deleted file mode 100644
index 1787013..0000000
--- a/Tests/CompileDefinitions/empty.cpp
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifdef _WIN32
-__declspec(dllexport)
-#endif
-int empty() { return 0; }
diff --git a/Tests/CompileDefinitions/runtest.c b/Tests/CompileDefinitions/runtest.c
index 9a236e9..02d2cad 100644
--- a/Tests/CompileDefinitions/runtest.c
+++ b/Tests/CompileDefinitions/runtest.c
@@ -43,15 +43,5 @@ int main()
return 1;
}
#endif
-#ifdef TEST_SEMICOLON
- if(strcmp(SEMICOLON_STRING1, "foo;bar") != 0
- || strcmp(SEMICOLON_STRING2, "foo;bar") != 0
- || strcmp(SEMICOLON_STRING3, "foo;bar") != 0
- || strcmp(SEMICOLON_STRING4, "foo;bar") != 0)
- {
- fprintf(stderr, "SEMICOLON_STRING is not \"foo;bar\"\n");
- return 1;
- }
-#endif
return 0;
}
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=56f5c88dfbcda4858fbf5904ffe03356dfa46c72
commit 56f5c88dfbcda4858fbf5904ffe03356dfa46c72
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Jul 24 13:29:03 2013 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Wed Jul 24 13:29:03 2013 -0400
Revert "Differentiate tests."
This reverts commit 444afd91f55fc2e8cabd8d9d275623f9f0f78238.
diff --git a/Tests/CompileDefinitions/runtest.c b/Tests/CompileDefinitions/runtest.c
index 8eec1a8..9a236e9 100644
--- a/Tests/CompileDefinitions/runtest.c
+++ b/Tests/CompileDefinitions/runtest.c
@@ -44,24 +44,12 @@ int main()
}
#endif
#ifdef TEST_SEMICOLON
- if(strcmp(SEMICOLON_STRING1, "foo;bar") != 0)
+ if(strcmp(SEMICOLON_STRING1, "foo;bar") != 0
+ || strcmp(SEMICOLON_STRING2, "foo;bar") != 0
+ || strcmp(SEMICOLON_STRING3, "foo;bar") != 0
+ || strcmp(SEMICOLON_STRING4, "foo;bar") != 0)
{
- fprintf(stderr, "SEMICOLON_STRING1 is not \"foo;bar\"\n");
- return 1;
- }
- if(strcmp(SEMICOLON_STRING2, "foo;bar") != 0)
- {
- fprintf(stderr, "SEMICOLON_STRING2 is not \"foo;bar\"\n");
- return 1;
- }
- if(strcmp(SEMICOLON_STRING3, "foo;bar") != 0)
- {
- fprintf(stderr, "SEMICOLON_STRING3 is not \"foo;bar\"\n");
- return 1;
- }
- if(strcmp(SEMICOLON_STRING4, "foo;bar") != 0)
- {
- fprintf(stderr, "SEMICOLON_STRING4 is not \"foo;bar\"\n");
+ fprintf(stderr, "SEMICOLON_STRING is not \"foo;bar\"\n");
return 1;
}
#endif
-----------------------------------------------------------------------
Summary of changes:
Tests/CompileDefinitions/CMakeLists.txt | 43 -------------------------------
Tests/CompileDefinitions/empty.cpp | 4 ---
Tests/CompileDefinitions/runtest.c | 22 ----------------
3 files changed, 0 insertions(+), 69 deletions(-)
delete mode 100644 Tests/CompileDefinitions/empty.cpp
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list