summaryrefslogtreecommitdiff
path: root/gnuradio-core/CMakeLists.txt
diff options
context:
space:
mode:
Diffstat (limited to 'gnuradio-core/CMakeLists.txt')
-rw-r--r--gnuradio-core/CMakeLists.txt7
1 files changed, 5 insertions, 2 deletions
diff --git a/gnuradio-core/CMakeLists.txt b/gnuradio-core/CMakeLists.txt
index 1138bcc453..97e94cbc16 100644
--- a/gnuradio-core/CMakeLists.txt
+++ b/gnuradio-core/CMakeLists.txt
@@ -44,6 +44,7 @@ GR_REGISTER_COMPONENT("gnuradio-core" ENABLE_GR_CORE
)
include(GrMiscUtils)
+
GR_SET_GLOBAL(GNURADIO_CORE_INCLUDE_DIRS
${CMAKE_CURRENT_SOURCE_DIR}/src/lib/runtime
${CMAKE_CURRENT_BINARY_DIR}/src/lib/general
@@ -61,6 +62,8 @@ GR_SET_GLOBAL(GNURADIO_CORE_INCLUDE_DIRS
${CMAKE_CURRENT_SOURCE_DIR}/src/lib/hier
)
+list(APPEND GNURADIO_CORE_INCLUDE_DIRS ${CMAKE_BINARY_DIR})
+
GR_SET_GLOBAL(GNURADIO_CORE_SWIG_INCLUDE_DIRS
${GNURADIO_CORE_INCLUDE_DIRS}
${CMAKE_CURRENT_SOURCE_DIR}/src/lib/swig
@@ -119,13 +122,13 @@ install(
COMPONENT "core_runtime"
)
-if(ENABLE_GR_LOG AND HAVE_LOG4CXX)
+if(ENABLE_GR_LOG AND HAVE_LOG4CPP)
install(FILES
${CMAKE_CURRENT_SOURCE_DIR}/gr_log_default.xml
DESTINATION ${GR_CONF_DIR}/gnuradio
COMPONENT "core_runtime"
)
-endif(ENABLE_GR_LOG AND HAVE_LOG4CXX)
+endif(ENABLE_GR_LOG AND HAVE_LOG4CPP)
########################################################################
# Add subdirectories