all CMakeLists are referenced by the top level one

add target for building with homebrew
2019-02-21 22:21:29 -08:00 · 2019-02-21 22:05:30 -08:00
10 changed files with 14 additions and 14 deletions
--- 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)
--- a/examples/CMakeLists.txt
+++ 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)
--- 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 
--- 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)
--- 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 .)

--- 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 
--- 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)
--- 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)
--- a/3
+++ b/3
@ -3,6 +3,9 @@
 #
 all: run

+brew:
+	mkdir -p ws/build && (cd ws/build ; cmake .. ; make)
+
 .PHONY: docker
 docker:
 	docker build -t broadcast_server:latest .
--- 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)

@ -34,3 +32,4 @@ if (APPLE AND USE_TLS)
 endif()

 target_link_libraries(ws ixwebsocket)
+install(TARGETS ws RUNTIME DESTINATION bin)
Author	SHA1	Message	Date
Benjamin Sergeant	90105fa2b3	all CMakeLists are referenced by the top level one	2019-02-21 22:21:29 -08:00
Benjamin Sergeant	24859fef8a	add target for building with homebrew	2019-02-21 22:05:30 -08:00