Skip to content
Snippets Groups Projects
Commit 1f68bc43 authored by Konstantin Osipov's avatar Konstantin Osipov
Browse files

Don't include third_party at the top level.

Don't pollute test/unit include space with
third_party includes.
parent a36a4ec9
No related branches found
No related tags found
No related merge requests found
......@@ -213,7 +213,6 @@ if (ENABLE_BUNDLED_LIBOBJC)
libobjc_build()
add_dependencies(build_bundled_libs objc)
set(HAVE_LIBOBJC_BUNDLED ON)
include_directories(${LIBOBJC_INCLUDE_DIR})
else()
if (CMAKE_COMPILER_IS_GNUCC)
# Use compiler's objc library
......@@ -241,7 +240,6 @@ set(ENABLE_BUNDLED_LIBEV ON)
include(BuildLibEV)
libev_build()
add_dependencies(build_bundled_libs ev)
include_directories(${LIBEV_INCLUDE_DIR})
#
# LibEIO
......@@ -257,7 +255,6 @@ else()
find_package(LibEIO)
endif()
include_directories(${LIBEIO_INCLUDE_DIR})
#
# LibCORO
......@@ -274,7 +271,6 @@ set(ENABLE_BUNDLED_LIBCORO ON)
include(BuildLibCORO)
libcoro_build()
add_dependencies(build_bundled_libs coro)
include_directories(${LIBCORO_INCLUDE_DIR})
if (${CMAKE_SYSTEM_PROCESSOR} MATCHES "86" OR ${CMAKE_SYSTEM_PROCESSOR} MATCHES "amd64")
add_definitions("-DCORO_ASM")
......@@ -290,8 +286,6 @@ include(BuildLibGOPT)
libgopt_build()
add_dependencies(build_bundled_libs gopt)
include_directories(${LIBGOPT_INCLUDE_DIR})
#
# Third-Party misc
#
......
......@@ -3,6 +3,14 @@
#
enable_tnt_compile_flags()
include_directories(${LIBEV_INCLUDE_DIR})
include_directories(${LIBEIO_INCLUDE_DIR})
include_directories(${LIBCORO_INCLUDE_DIR})
include_directories(${LIBGOPT_INCLUDE_DIR})
if (ENABLE_BUNDLED_LIBOBJC)
include_directories(${LIBOBJC_INCLUDE_DIR})
endif()
# Require pthread globally if compiling with GCC
if (CMAKE_COMPILER_IS_GNUCC)
add_compile_flags("C;CXX" "-pthread")
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment