summaryrefslogtreecommitdiffstats
path: root/test/CMakeLists.txt
diff options
context:
space:
mode:
authorStefan Radomski <radomski@tk.informatik.tu-darmstadt.de>2014-08-13 13:29:38 (GMT)
committerStefan Radomski <radomski@tk.informatik.tu-darmstadt.de>2014-08-13 13:29:38 (GMT)
commitfe941ab36b44f083886c07a72d371b2cfba55fe3 (patch)
tree2dfe945f5b0b4272f573cda18f24caa623c122c7 /test/CMakeLists.txt
parent02f52d15e7df2500c0c6e96660a43a985add16e8 (diff)
downloaduscxml-fe941ab36b44f083886c07a72d371b2cfba55fe3.zip
uscxml-fe941ab36b44f083886c07a72d371b2cfba55fe3.tar.gz
uscxml-fe941ab36b44f083886c07a72d371b2cfba55fe3.tar.bz2
Build on Linux and Windows again
Diffstat (limited to 'test/CMakeLists.txt')
-rw-r--r--test/CMakeLists.txt19
1 files changed, 10 insertions, 9 deletions
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index dbc5a15..b879401 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -62,6 +62,16 @@ add_test(test-lifecycle ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/test-lifecycle)
set_target_properties(test-lifecycle PROPERTIES FOLDER "Tests")
if (NOT WIN32)
+ add_executable(test-vxml-mmi-socket src/test-vxml-mmi-socket.cpp)
+ target_link_libraries(test-vxml-mmi-socket uscxml)
+ # add_test(test-datamodel ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/test-sockets)
+ set_target_properties(test-vxml-mmi-socket PROPERTIES FOLDER "Tests")
+
+ add_executable(test-vxml-mmi-http src/test-vxml-mmi-http.cpp)
+ target_link_libraries(test-vxml-mmi-http uscxml)
+ # add_test(test-datamodel ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/test-sockets)
+ set_target_properties(test-vxml-mmi-http PROPERTIES FOLDER "Tests")
+
add_executable(test-trie src/test-trie.cpp)
target_link_libraries(test-trie uscxml)
add_test(test-trie ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/test-trie)
@@ -141,15 +151,6 @@ target_link_libraries(test-sockets uscxml)
# add_test(test-datamodel ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/test-sockets)
set_target_properties(test-sockets PROPERTIES FOLDER "Tests")
-add_executable(test-vxml-mmi-socket src/test-vxml-mmi-socket.cpp)
-target_link_libraries(test-vxml-mmi-socket uscxml)
-# add_test(test-datamodel ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/test-sockets)
-set_target_properties(test-vxml-mmi-socket PROPERTIES FOLDER "Tests")
-
-add_executable(test-vxml-mmi-http src/test-vxml-mmi-http.cpp)
-target_link_libraries(test-vxml-mmi-http uscxml)
-# add_test(test-datamodel ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/test-sockets)
-set_target_properties(test-vxml-mmi-http PROPERTIES FOLDER "Tests")
# if (NOT WIN32)
# add_executable(test-mmi src/test-mmi.cpp)