From ea2107d33af86819e961a17c30a6e3a10908b84a Mon Sep 17 00:00:00 2001 From: Nathan Hourt Date: Thu, 17 Mar 2016 17:27:21 -0500 Subject: [PATCH 1/2] Prevent websocketpp from polluting installs When clients of fc (such as graphene) do an install (via `make install` or similar), websocketpp was installing as well. This commit prevents this from happening. --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index eeadd2b..53ac49f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -249,7 +249,7 @@ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/src/git_revision.cpp.in" "${CMAKE_CU list(APPEND sources "${CMAKE_CURRENT_BINARY_DIR}/git_revision.cpp") list(APPEND sources ${fc_headers}) -add_subdirectory( vendor/websocketpp ) +add_subdirectory( vendor/websocketpp EXCLUDE_FROM_ALL ) add_subdirectory( vendor/udt4 ) setup_library( fc SOURCES ${sources} LIBRARY_TYPE STATIC DONT_INSTALL_LIBRARY ) From 397c10ce1982f1c007a1efc38454ff63f85c1eed Mon Sep 17 00:00:00 2001 From: Nathan Hourt Date: Thu, 17 Mar 2016 17:41:22 -0500 Subject: [PATCH 2/2] Fix installation FC now installs properly with a `make install` --- CMakeLists.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 53ac49f..f1bcdce 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -252,7 +252,8 @@ list(APPEND sources ${fc_headers}) add_subdirectory( vendor/websocketpp EXCLUDE_FROM_ALL ) add_subdirectory( vendor/udt4 ) -setup_library( fc SOURCES ${sources} LIBRARY_TYPE STATIC DONT_INSTALL_LIBRARY ) +setup_library( fc SOURCES ${sources} LIBRARY_TYPE STATIC ) +install( DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/include/" DESTINATION include ) # begin readline stuff find_package(Curses)