diff --git a/CMakeLists.txt b/CMakeLists.txt index b5212240e..ca5e25e90 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -33,9 +33,6 @@ else() set(BUILD_ADMIN_WEB_APP ON CACHE BOOL "Build the Admin WebApp") endif() -include_directories(BEFORE SYSTEM ${EXTERNALS_INCLUDE} ${EXTERNALS_ROOT}/include/zlib) -link_directories(${EXTERNALS_LIB}) - add_compile_definitions(SHARED_MEMORY_PREFIX="${SHARED_MEMORY_PREFIX}") if(DEFINED APP_DATA_DIR) add_compile_definitions(APP_DATA_DIR="${APP_DATA_DIR}") diff --git a/cmake/InitLibrary.cmake b/cmake/InitLibrary.cmake index 9bc7b754d..eeb086c11 100644 --- a/cmake/InitLibrary.cmake +++ b/cmake/InitLibrary.cmake @@ -72,6 +72,14 @@ function(init_library) else() add_library(${_name} ${${_name}_SOURCES} ${${_name}_CXX_PROTO_SOURCES}) endif() + target_include_directories( + ${_name} + SYSTEM + BEFORE + PUBLIC + $ + $ + ) target_include_directories( ${_name} PUBLIC @@ -90,6 +98,7 @@ function(init_library) ${_name} PUBLIC $ + $> $ ) # Install main lib