Commit 49972f84 authored by Simon Morlat's avatar Simon Morlat

Fix CMakeLists (order of include, and remove include paths from files to be compiled by library).

parent 071d9bba
Pipeline #2161 passed with stages
in 43 minutes and 24 seconds
...@@ -228,13 +228,13 @@ find_package(OpenSSL 0.9.8 REQUIRED) ...@@ -228,13 +228,13 @@ find_package(OpenSSL 0.9.8 REQUIRED)
feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES) feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES)
include_directories( include_directories(
include/
src/
src/plugin
${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_BINARY_DIR}/src/ ${CMAKE_CURRENT_BINARY_DIR}/src/
${ORTP_INCLUDE_DIRS} ${ORTP_INCLUDE_DIRS}
${SOFIASIPUA_INCLUDE_DIRS} ${SOFIASIPUA_INCLUDE_DIRS}
include/
src/
src/plugin
) )
set(BELR_GRAMMARS_DIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATADIR}/belr/grammars") set(BELR_GRAMMARS_DIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATADIR}/belr/grammars")
......
...@@ -291,7 +291,7 @@ if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU") ...@@ -291,7 +291,7 @@ if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
set_source_files_properties(stun/stun.c PROPERTIES COMPILE_FLAGS "-Wno-error=sign-compare") set_source_files_properties(stun/stun.c PROPERTIES COMPILE_FLAGS "-Wno-error=sign-compare")
endif() endif()
add_library(flexisip SHARED ${FLEXISIP_INCLUDES} ${FLEXISIP_SOURCES}) add_library(flexisip SHARED ${FLEXISIP_SOURCES})
set_property(TARGET flexisip PROPERTY CXX_STANDARD 11) set_property(TARGET flexisip PROPERTY CXX_STANDARD 11)
set_property(TARGET flexisip PROPERTY CXX_STANDARD_REQUIRED ON) set_property(TARGET flexisip PROPERTY CXX_STANDARD_REQUIRED ON)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment