Move some of the -I stuff from top level to epan.

svn path=/trunk/; revision=29941

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8783f2e3f88ec2de60bf2148f308bd608ea83e3c..2017772960dc1c31d3e57f169f402187331efe04 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -41,19 +41,11 @@ include(CMakeInstallDirs)
 
 include_directories(
        ${CMAKE_BINARY_DIR}
-       ${CMAKE_BINARY_DIR}/epan
-       ${CMAKE_BINARY_DIR}/epan/wslua
-       ${CMAKE_BINARY_DIR}/epan/wspython
+
        ${CMAKE_SOURCE_DIR}
        ${CMAKE_SOURCE_DIR}/epan
-       ${CMAKE_SOURCE_DIR}/epan/dfilter
-       ${CMAKE_SOURCE_DIR}/epan/dissectors
-       ${CMAKE_SOURCE_DIR}/epan/ftypes
-       ${CMAKE_SOURCE_DIR}/epan/wslua
-       ${CMAKE_SOURCE_DIR}/epan/wspython
        ${CMAKE_SOURCE_DIR}/tools/lemon
        ${CMAKE_SOURCE_DIR}/wiretap
-       ${CMAKE_SOURCE_DIR}/wsutil
 )
 
 #Where to put libraries

diff --git a/epan/CMakeLists.txt b/epan/CMakeLists.txt
index af10637ca55581613714c08715c214d3ee76e504..37fb5d01a0b97147da0dd11c4acf773a1c45b40a 100644 (file)
--- a/epan/CMakeLists.txt
+++ b/epan/CMakeLists.txt
@@ -34,6 +34,18 @@ else()
        set(WSPYTHON_LIB )
 endif()
 
+include_directories(
+       ${CMAKE_CURRENT_BINARY_DIR}
+       ${CMAKE_CURRENT_BINARY_DIR}/wslua
+       ${CMAKE_CURRENT_BINARY_DIR}/wspython
+
+       ${CMAKE_CURRENT_SOURCE_DIR}/dfilter
+       ${CMAKE_CURRENT_SOURCE_DIR}/dissectors
+       ${CMAKE_CURRENT_SOURCE_DIR}/ftypes
+       ${CMAKE_CURRENT_SOURCE_DIR}/wslua
+       ${CMAKE_CURRENT_SOURCE_DIR}/wspython
+)
+
 link_directories(
        wslua
        wspython