diff options
| author | Stefan Radomski <radomski@tk.informatik.tu-darmstadt.de> | 2014-08-28 19:25:13 (GMT) |
|---|---|---|
| committer | Stefan Radomski <radomski@tk.informatik.tu-darmstadt.de> | 2014-08-28 19:25:13 (GMT) |
| commit | c36b123a60278caef5d06e8a7d0b3d338d669c75 (patch) | |
| tree | a327cad0b71f9d52cdeafdff18835ccb004c6245 | |
| parent | 24e3de124af4025d151a0b2775c6c3c04299de4b (diff) | |
| download | uscxml-c36b123a60278caef5d06e8a7d0b3d338d669c75.zip uscxml-c36b123a60278caef5d06e8a7d0b3d338d669c75.tar.gz uscxml-c36b123a60278caef5d06e8a7d0b3d338d669c75.tar.bz2 | |
Fixed some linker issues with MSVC
| -rw-r--r-- | contrib/cmake/CPackUSCXML.cmake | 4 | ||||
| -rw-r--r-- | test/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | test/src/test-w3c.cpp | 1 |
3 files changed, 5 insertions, 4 deletions
diff --git a/contrib/cmake/CPackUSCXML.cmake b/contrib/cmake/CPackUSCXML.cmake index 943dbc3..aa9960b 100644 --- a/contrib/cmake/CPackUSCXML.cmake +++ b/contrib/cmake/CPackUSCXML.cmake @@ -28,8 +28,8 @@ foreach(PLATFORM_LIB ${PLATFORM_LIBS}) elseif (PLATFORM_LIB MATCHES ".*uscxml.*") install(FILES ${PLATFORM_LIB} DESTINATION lib COMPONENT library) list (APPEND USCXML_CPACK_COMPONENTS "library") - else() - message(STATUS "PACKAGE RELEASE UNK ${PLATFORM_LIB} - not packaging") + # else() + # message(STATUS "PACKAGE RELEASE UNK ${PLATFORM_LIB} - not packaging") endif() endforeach() diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index c9f0a9f..7a0ad3a 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -24,17 +24,17 @@ if (NOT WIN32) USCXML_TEST_COMPILE(NAME test-arabica-events LABEL general/test-arabica-events FILES src/test-arabica-events.cpp ARGS ${CMAKE_CURRENT_SOURCE_DIR}/uscxml/arabica/test-arabica-events.xml) USCXML_TEST_COMPILE(NAME test-arabica-parsing LABEL general/test-arabica-parsing FILES src/test-arabica-parsing.cpp) + USCXML_TEST_COMPILE(NAME test-promela-parser LABEL general/test-promela-parser FILES src/test-promela-parser.cpp) + USCXML_TEST_COMPILE(BUILD_ONLY NAME test-stress LABEL general/test-stress FILES src/test-stress.cpp) endif() if (APPLE) USCXML_TEST_COMPILE(BUILD_ONLY NAME test-dirmon LABEL general/test-dirmon FILES src/test-dirmon.cpp) endif() -USCXML_TEST_COMPILE(BUILD_ONLY NAME test-stress LABEL general/test-stress FILES src/test-stress.cpp) USCXML_TEST_COMPILE(BUILD_ONLY NAME test-sockets LABEL general/test-sockets FILES src/test-sockets.cpp) USCXML_TEST_COMPILE(NAME test-url LABEL general/test-url FILES src/test-url.cpp) -USCXML_TEST_COMPILE(NAME test-promela-parser LABEL general/test-promela-parser FILES src/test-promela-parser.cpp) USCXML_TEST_COMPILE(NAME test-base64 LABEL general/test-base64 FILES src/test-base64.cpp) USCXML_TEST_COMPILE(NAME test-eventdelay LABEL general/test-eventdelay FILES src/test-eventdelay.cpp) USCXML_TEST_COMPILE(NAME test-flat-stateid LABEL general/test-flat-stateid FILES src/test-flat-stateid.cpp) diff --git a/test/src/test-w3c.cpp b/test/src/test-w3c.cpp index a03eab7..3c20e76 100644 --- a/test/src/test-w3c.cpp +++ b/test/src/test-w3c.cpp @@ -15,6 +15,7 @@ #ifdef _WIN32 #include "XGetopt.h" +#include "XGetopt.cpp" #endif static bool withFlattening = false; |