diff options
| author | Stefan Radomski <github@mintwerk.de> | 2016-08-02 12:35:39 (GMT) |
|---|---|---|
| committer | Stefan Radomski <github@mintwerk.de> | 2016-08-02 12:35:39 (GMT) |
| commit | 9c0b89a29168d46b58712ec3634ecea4d9a7a681 (patch) | |
| tree | 93a4574e57f7fe164bca061b0dd0f596e0415783 | |
| parent | 05e908c1f1fd1483cea3cdfbce22aaecde219785 (diff) | |
| download | uscxml-9c0b89a29168d46b58712ec3634ecea4d9a7a681.zip uscxml-9c0b89a29168d46b58712ec3634ecea4d9a7a681.tar.gz uscxml-9c0b89a29168d46b58712ec3634ecea4d9a7a681.tar.bz2 | |
Fixed some MSVC errors
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/uscxml/plugins/datamodel/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | test/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | test/src/test-stress.cpp | 1 |
4 files changed, 4 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index a74b64b..cca6649 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -370,7 +370,7 @@ if (WITH_DM_LUA) endif() endif() -OPTION(WITH_DM_C89 "Do build with C89 datamodel support" ON) +OPTION(WITH_DM_C89 "Do build with C89 datamodel support" OFF) add_subdirectory(src/uscxml) add_subdirectory(src/bindings) diff --git a/src/uscxml/plugins/datamodel/CMakeLists.txt b/src/uscxml/plugins/datamodel/CMakeLists.txt index 31191cc..4004ef2 100644 --- a/src/uscxml/plugins/datamodel/CMakeLists.txt +++ b/src/uscxml/plugins/datamodel/CMakeLists.txt @@ -47,7 +47,7 @@ if (LUA_FOUND) list (APPEND USCXML_OPT_LIBS ${LUA_LIBRARY}) endif() -if (OFF) # do not build ANSI C datamodel for now +if (WITH_DM_C89) set(USCXML_DATAMODELS "c89 ${USCXML_DATAMODELS}") # Lua ecmascript datamodel file(GLOB_RECURSE C89_DATAMODEL diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index bba5e5f..e14586c 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -29,7 +29,7 @@ USCXML_TEST_COMPILE(NAME test-url LABEL general/test-url FILES src/test-url.cpp) USCXML_TEST_COMPILE(NAME test-lifecycle LABEL general/test-lifecycle FILES src/test-lifecycle.cpp) USCXML_TEST_COMPILE(NAME test-validating LABEL general/test-validating FILES src/test-validating.cpp) USCXML_TEST_COMPILE(NAME test-snippets LABEL general/test-snippets FILES src/test-snippets.cpp) -USCXML_TEST_COMPILE(NAME test-c89-parser LABEL general/test-c89-parser FILES src/test-c89-parser.cpp) +# USCXML_TEST_COMPILE(NAME test-c89-parser LABEL general/test-c89-parser FILES src/test-c89-parser.cpp) # test-stress is not an automated test add_executable(test-stress src/test-stress.cpp) diff --git a/test/src/test-stress.cpp b/test/src/test-stress.cpp index dc54f4e..4091dea 100644 --- a/test/src/test-stress.cpp +++ b/test/src/test-stress.cpp @@ -10,6 +10,7 @@ #ifdef _WIN32 #include "XGetopt.h" +#include "XGetopt.cpp" #endif int startedAt; |