From 41a40b8b9fab02e9b7a22095b8a20b6ca32e6fa9 Mon Sep 17 00:00:00 2001 From: Benjamin Sergeant Date: Thu, 21 Feb 2019 22:21:29 -0800 Subject: [PATCH] all CMakeLists are referenced by the top level one --- CMakeLists.txt | 3 +++ examples/CMakeLists.txt | 7 +++++++ examples/broadcast_server/CMakeLists.txt | 2 -- examples/chat/CMakeLists.txt | 2 -- examples/cobra_publisher/CMakeLists.txt | 2 -- examples/echo_server/CMakeLists.txt | 2 -- examples/ping_pong/CMakeLists.txt | 2 -- examples/ws_connect/CMakeLists.txt | 2 -- ws/CMakeLists.txt | 2 -- 9 files changed, 10 insertions(+), 14 deletions(-) create mode 100644 examples/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt index 8c85d9ab..f0c9e528 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -113,3 +113,6 @@ set( IXWEBSOCKET_INCLUDE_DIRS . ../../shared/OpenSSL/include) target_include_directories( ixwebsocket PUBLIC ${IXWEBSOCKET_INCLUDE_DIRS} ) + +add_subdirectory(ws) +add_subdirectory(examples) diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt new file mode 100644 index 00000000..87a976b2 --- /dev/null +++ b/examples/CMakeLists.txt @@ -0,0 +1,7 @@ +add_subdirectory(broadcast_server) +add_subdirectory(ping_pong) +add_subdirectory(chat) +add_subdirectory(echo_server) +add_subdirectory(ws_connect) + +# add_subdirectory(cobra_publisher) diff --git a/examples/broadcast_server/CMakeLists.txt b/examples/broadcast_server/CMakeLists.txt index f845a384..fbab35f9 100644 --- a/examples/broadcast_server/CMakeLists.txt +++ b/examples/broadcast_server/CMakeLists.txt @@ -15,8 +15,6 @@ set (CMAKE_CXX_STANDARD 14) option(USE_TLS "Add TLS support" ON) -add_subdirectory(${PROJECT_SOURCE_DIR}/../.. ixwebsocket) - include_directories(broadcast_server .) add_executable(broadcast_server diff --git a/examples/chat/CMakeLists.txt b/examples/chat/CMakeLists.txt index 8970caf7..8ef6357b 100644 --- a/examples/chat/CMakeLists.txt +++ b/examples/chat/CMakeLists.txt @@ -11,8 +11,6 @@ set (CMAKE_CXX_STANDARD 14) option(USE_TLS "Add TLS support" ON) -add_subdirectory(${PROJECT_SOURCE_DIR}/../.. ixwebsocket) - add_executable(cmd_websocket_chat cmd_websocket_chat.cpp) if (APPLE AND USE_TLS) diff --git a/examples/cobra_publisher/CMakeLists.txt b/examples/cobra_publisher/CMakeLists.txt index f3a1f252..67a5fe60 100644 --- a/examples/cobra_publisher/CMakeLists.txt +++ b/examples/cobra_publisher/CMakeLists.txt @@ -15,8 +15,6 @@ set (CMAKE_CXX_STANDARD 14) option(USE_TLS "Add TLS support" ON) -add_subdirectory(${PROJECT_SOURCE_DIR}/../.. ixwebsocket) - include_directories(cobra_publisher ${OPENSSL_PREFIX}/include) include_directories(cobra_publisher .) diff --git a/examples/echo_server/CMakeLists.txt b/examples/echo_server/CMakeLists.txt index b54e54c4..07afd709 100644 --- a/examples/echo_server/CMakeLists.txt +++ b/examples/echo_server/CMakeLists.txt @@ -15,8 +15,6 @@ set (CMAKE_CXX_STANDARD 14) option(USE_TLS "Add TLS support" ON) -add_subdirectory(${PROJECT_SOURCE_DIR}/../.. ixwebsocket) - include_directories(echo_server .) add_executable(echo_server diff --git a/examples/ping_pong/CMakeLists.txt b/examples/ping_pong/CMakeLists.txt index 563a2650..c520e8f7 100644 --- a/examples/ping_pong/CMakeLists.txt +++ b/examples/ping_pong/CMakeLists.txt @@ -10,8 +10,6 @@ set (CMAKE_CXX_STANDARD 14) option(USE_TLS "Add TLS support" ON) -add_subdirectory(${PROJECT_SOURCE_DIR}/../.. ixwebsocket) - add_executable(ping_pong ping_pong.cpp) if (APPLE AND USE_TLS) diff --git a/examples/ws_connect/CMakeLists.txt b/examples/ws_connect/CMakeLists.txt index e620c39f..56b012b6 100644 --- a/examples/ws_connect/CMakeLists.txt +++ b/examples/ws_connect/CMakeLists.txt @@ -10,8 +10,6 @@ set (CMAKE_CXX_STANDARD 14) option(USE_TLS "Add TLS support" ON) -add_subdirectory(${PROJECT_SOURCE_DIR}/../.. ixwebsocket) - add_executable(ws_connect ws_connect.cpp) if (APPLE AND USE_TLS) diff --git a/ws/CMakeLists.txt b/ws/CMakeLists.txt index 8c2f9737..168cd991 100644 --- a/ws/CMakeLists.txt +++ b/ws/CMakeLists.txt @@ -13,8 +13,6 @@ set (CMAKE_CXX_STANDARD 14) option(USE_TLS "Add TLS support" ON) -add_subdirectory(${PROJECT_SOURCE_DIR}/.. ixwebsocket) - include_directories(ws .) include_directories(ws ../third_party)