ExampleMessages -> ExampleTypes

[dragonnet-example.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b70bd76247602ab00ae584d2427282a1fa379470..e307f88a0151bdb25c7c66da4ffadedf18bb99a4 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -10,8 +10,6 @@ link_libraries(
 
 set(DEPS_DIR "${CMAKE_SOURCE_DIR}/deps/")
 
-add_compile_definitions(DRAGONTYPE_ENDIAN_HEADER="${DEPS_DIR}/endian.h/endian.h")
-
 include_directories(SYSTEM
        ${DEPS_DIR}
 )
@@ -19,7 +17,11 @@ include_directories(SYSTEM
 add_compile_options(-Wall -Wextra -Werror -fmax-errors=4)
 
 set(SOURCES_COMMON
-       "${DEPS_DIR}/dragontype/implementation.c"
+       "${DEPS_DIR}/dragontype/array.c"
+       "${DEPS_DIR}/dragontype/bintree.c"
+       "${DEPS_DIR}/dragontype/list.c"
+       "${DEPS_DIR}/dragontype/number.c"
+       "${DEPS_DIR}/dragontype/queue.c"
        "${DEPS_DIR}/dragonport/asprintf.c"
        "${DEPS_DIR}/dragonnet/addr.c"
        "${DEPS_DIR}/dragonnet/listen.c"
@@ -27,21 +29,21 @@ set(SOURCES_COMMON
        "${DEPS_DIR}/dragonnet/recv_thread.c"
 )
 
-add_executable(DragonnetGenMessages
+add_executable(DragonnetTypegen
        ${SOURCES_COMMON}
-       "${DEPS_DIR}/dragonnet/gen_messages.c"
+       "${DEPS_DIR}/dragonnet/typegen/main.c"
 )
 
 add_custom_command(
-       OUTPUT "${CMAKE_SOURCE_DIR}/messages.h"
-       COMMAND "${CMAKE_BINARY_DIR}/DragonnetGenMessages"
-       MAIN_DEPENDENCY "${CMAKE_SOURCE_DIR}/messages.dnet"
-       DEPENDS DragonnetGenMessages
+       OUTPUT "${CMAKE_SOURCE_DIR}/dnet-types.h"
+       COMMAND "${CMAKE_BINARY_DIR}/DragonnetTypegen"
+       MAIN_DEPENDENCY "${CMAKE_SOURCE_DIR}/types.dnet"
+       DEPENDS DragonnetTypegen
        WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
 )
 
-add_custom_target(ExampleMessages
-       DEPENDS "${CMAKE_SOURCE_DIR}/messages.h"
+add_custom_target(ExampleTypes
+       DEPENDS "${CMAKE_SOURCE_DIR}/dnet-types.h"
 )
 
 add_executable(ExampleClient
@@ -49,11 +51,11 @@ add_executable(ExampleClient
        client.c
 )
 
-add_dependencies(ExampleClient ExampleMessages)
+add_dependencies(ExampleClient ExampleTypes)
 
 add_executable(ExampleServer
        ${SOURCES_COMMON}
        server.c
 )
 
-add_dependencies(ExampleServer ExampleMessages)
+add_dependencies(ExampleServer ExampleTypes)