diff --git a/CMakeLists.txt b/CMakeLists.txt index 02b688c..03b185f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -27,7 +27,6 @@ endif() set(CMAKE_POSITION_INDEPENDENT_CODE ON) set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake/Modules) -set(BUILD_SHARED_LIBS OFF) # to force usrsctp to be built static if(WIN32) add_definitions(-DWIN32_LEAN_AND_MEAN) @@ -196,9 +195,10 @@ set(CMAKE_THREAD_PREFER_PTHREAD TRUE) set(THREADS_PREFER_PTHREAD_FLAG TRUE) find_package(Threads REQUIRED) -set(CMAKE_POLICY_DEFAULT_CMP0048 NEW) -add_subdirectory(deps/plog EXCLUDE_FROM_ALL) +find_library(USRSCTP_LIBRARY usrsctp REQUIRED) +find_path(PLOG_INCLUDE_DIRS "plog/Appenders/AndroidAppender.h") +if(0) option(sctp_build_programs 0) option(sctp_build_shared_lib 0) set(CMAKE_POLICY_DEFAULT_CMP0077 NEW) @@ -210,8 +210,8 @@ if (CMAKE_CXX_COMPILER_ID MATCHES "GNU") target_compile_options(usrsctp PRIVATE -Wno-error=format-truncation) endif() add_library(Usrsctp::Usrsctp ALIAS usrsctp) - -add_library(datachannel SHARED +endif() +add_library(datachannel ${LIBDATACHANNEL_SOURCES} ${LIBDATACHANNEL_HEADERS} ${LIBDATACHANNEL_IMPL_SOURCES} @@ -235,16 +235,18 @@ target_include_directories(datachannel PUBLIC $) target_include_directories(datachannel PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include/rtc) target_include_directories(datachannel PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src) +target_include_directories(datachannel PRIVATE ${PLOG_INCLUDE_DIRS}) target_link_libraries(datachannel PRIVATE Threads::Threads) -target_link_libraries(datachannel PRIVATE Usrsctp::Usrsctp plog::plog) +target_link_libraries(datachannel PRIVATE ${USRSCTP_LIBRARY}) target_include_directories(datachannel-static PUBLIC $ $) target_include_directories(datachannel-static PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include/rtc) target_include_directories(datachannel-static PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src) +target_include_directories(datachannel PRIVATE ${PLOG_INCLUDE_DIRS}) target_link_libraries(datachannel-static PRIVATE Threads::Threads) -target_link_libraries(datachannel-static PRIVATE Usrsctp::Usrsctp plog::plog) +target_link_libraries(datachannel-static PRIVATE ${USRSCTP_LIBRARY}) if(WIN32) target_link_libraries(datachannel PUBLIC ws2_32) # winsock2 @@ -339,11 +341,11 @@ else() target_link_libraries(datachannel PRIVATE LibJuice::LibJuice) target_link_libraries(datachannel-static PRIVATE LibJuice::LibJuice) else() - add_subdirectory(deps/libjuice EXCLUDE_FROM_ALL) + find_package(LibJuice CONFIG REQUIRED) target_compile_definitions(datachannel PRIVATE RTC_SYSTEM_JUICE=0) target_compile_definitions(datachannel-static PRIVATE RTC_SYSTEM_JUICE=0) - target_link_libraries(datachannel PRIVATE LibJuice::LibJuiceStatic) - target_link_libraries(datachannel-static PRIVATE LibJuice::LibJuiceStatic) + target_link_libraries(datachannel PRIVATE LibJuice::juice) + target_link_libraries(datachannel-static PRIVATE LibJuice::juice) endif() endif()