cmake: Use CMAKE_INCLUDE_CURRENT_DIR

This avoids including CMAKE_CURRENT_BINARY_DIR in nearly every
subdirectory

12 files changed, 15 insertions, 14 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2b70cec..a8d6871 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,8 +4,9 @@ enable_testing()
 
 set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 set(CMAKE_AUTOMOC ON)
-
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
 set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules)
+
 set(QTGSTREAMER_VERSION 0.10.2.1)
 
 option(QTGSTREAMER_STATIC "Build QtGStreamer as a static library" OFF)
diff --git a/codegen/CMakeLists.txt b/codegen/CMakeLists.txt
index ef26b04..af70bbb 100644
--- a/codegen/CMakeLists.txt
+++ b/codegen/CMakeLists.txt
@@ -1,4 +1,4 @@
-include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${QT_INCLUDE_DIR})
+include_directories(${QT_INCLUDE_DIR})
 
 flex_target(analyzer analyzer.l ${CMAKE_CURRENT_BINARY_DIR}/analyzer.cpp)
 bison_target(parser parser.y ${CMAKE_CURRENT_BINARY_DIR}/parser.cpp COMPILE_FLAGS "--defines")
diff --git a/elements/gstqtvideosink/CMakeLists.txt b/elements/gstqtvideosink/CMakeLists.txt
index c490e1b..db253ff 100644
--- a/elements/gstqtvideosink/CMakeLists.txt
+++ b/elements/gstqtvideosink/CMakeLists.txt
@@ -1,5 +1,3 @@
-include_directories(${CMAKE_CURRENT_BINARY_DIR})
-
 glib2_genmarshal(gstqtvideosinkmarshal
     VOID:POINTER,FLOAT,FLOAT,FLOAT,FLOAT
     VOID:POINTER,DOUBLE,DOUBLE,DOUBLE,DOUBLE
diff --git a/examples/player/CMakeLists.txt b/examples/player/CMakeLists.txt
index b89363d..b0d49ba 100644
--- a/examples/player/CMakeLists.txt
+++ b/examples/player/CMakeLists.txt
@@ -3,9 +3,10 @@ project(qtgst-example-player)
 if (NOT BUILDING_QTGSTREAMER)
     find_package(QtGStreamer REQUIRED)
     set(CMAKE_AUTOMOC ON)
+    set(CMAKE_INCLUDE_CURRENT_DIR ON)
 endif()
 
-include_directories(${QTGSTREAMER_INCLUDES} ${CMAKE_CURRENT_BINARY_DIR})
+include_directories(${QTGSTREAMER_INCLUDES})
 add_definitions(${QTGSTREAMER_DEFINITIONS})
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${QTGSTREAMER_FLAGS}")
 
diff --git a/examples/qmlplayer/CMakeLists.txt b/examples/qmlplayer/CMakeLists.txt
index 1c7f17a..cabb111 100644
--- a/examples/qmlplayer/CMakeLists.txt
+++ b/examples/qmlplayer/CMakeLists.txt
@@ -10,6 +10,7 @@ if (NOT BUILDING_QTGSTREAMER)
     find_package(OpenGLES2)
 
     set(CMAKE_AUTOMOC ON)
+    set(CMAKE_INCLUDE_CURRENT_DIR ON)
 else()
     # allow the example to run from the build tree without installing QtGStreamer
     add_definitions(
@@ -18,7 +19,7 @@ else()
     )
 endif()
 
-include_directories(${QTGSTREAMER_INCLUDES} ${CMAKE_CURRENT_BINARY_DIR})
+include_directories(${QTGSTREAMER_INCLUDES})
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${QTGSTREAMER_FLAGS}")
 add_definitions(${QTGSTREAMER_DEFINITIONS})
 
diff --git a/examples/recorder/CMakeLists.txt b/examples/recorder/CMakeLists.txt
index 26d482f..fa30e9e 100644
--- a/examples/recorder/CMakeLists.txt
+++ b/examples/recorder/CMakeLists.txt
@@ -3,9 +3,10 @@ project(qtgst-example-recorder)
 if (NOT BUILDING_QTGSTREAMER)
     find_package(QtGStreamer REQUIRED)
     set(CMAKE_AUTOMOC ON)
+    set(CMAKE_INCLUDE_CURRENT_DIR ON)
 endif()
 
-include_directories(${QTGSTREAMER_INCLUDES} ${CMAKE_CURRENT_BINARY_DIR})
+include_directories(${QTGSTREAMER_INCLUDES})
 add_definitions(${QTGSTREAMER_DEFINITIONS})
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${QTGSTREAMER_FLAGS}")
 
diff --git a/examples/voip/CMakeLists.txt b/examples/voip/CMakeLists.txt
index 4d31591..d16dfae 100644
--- a/examples/voip/CMakeLists.txt
+++ b/examples/voip/CMakeLists.txt
@@ -3,9 +3,10 @@ project(qtgst-example-voip)
 if (NOT BUILDING_QTGSTREAMER)
     find_package(QtGStreamer REQUIRED)
     set(CMAKE_AUTOMOC ON)
+    set(CMAKE_INCLUDE_CURRENT_DIR ON)
 endif()
 
-include_directories(${QTGSTREAMER_INCLUDES} ${CMAKE_CURRENT_BINARY_DIR})
+include_directories(${QTGSTREAMER_INCLUDES})
 add_definitions(${QTGSTREAMER_DEFINITIONS})
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${QTGSTREAMER_FLAGS}")
 
diff --git a/src/QGlib/CMakeLists.txt b/src/QGlib/CMakeLists.txt
index 915bbbd..4a8d503 100644
--- a/src/QGlib/CMakeLists.txt
+++ b/src/QGlib/CMakeLists.txt
@@ -39,7 +39,7 @@ set(QtGLib_CODEGEN_INCLUDES
 # Setup the environment
 set(QTGLIB_API_VERSION 2.0)
 set(QTGLIB_SOVERSION 0)
-include_directories(${CMAKE_CURRENT_BINARY_DIR} ${GOBJECT_INCLUDE_DIR} ${GLIB2_INCLUDE_DIR})
+include_directories(${GOBJECT_INCLUDE_DIR} ${GLIB2_INCLUDE_DIR})
 
 # Add command to generate gen.cpp using codegen
 run_codegen("QGlib" "${QtGLib_CODEGEN_INCLUDES}" "${QtGLib_CODEGEN_HEADERS}")
diff --git a/src/QGst/CMakeLists.txt b/src/QGst/CMakeLists.txt
index df1f6d4..297e364 100644
--- a/src/QGst/CMakeLists.txt
+++ b/src/QGst/CMakeLists.txt
@@ -119,7 +119,6 @@ set(QTGSTREAMER_SOVERSION 0)
 set(QTGSTREAMER_UI_SOVERSION 0)
 set(QTGSTREAMER_UTILS_SOVERSION 0)
 include_directories(
-    ${CMAKE_CURRENT_BINARY_DIR}
     ${GSTREAMER_INCLUDE_DIR}
     ${GSTREAMER_INTERFACES_INCLUDE_DIR}
     ${GSTREAMER_BASE_INCLUDE_DIR}
diff --git a/src/qml/CMakeLists.txt b/src/qml/CMakeLists.txt
index d885f0b..1bd63cb 100644
--- a/src/qml/CMakeLists.txt
+++ b/src/qml/CMakeLists.txt
@@ -3,7 +3,6 @@ set(QtGStreamerQML_SRCS
     videoitem.cpp
 )
 
-include_directories(${CMAKE_CURRENT_BINARY_DIR})
 add_library(QtGStreamerQML MODULE ${QtGStreamerQML_SRCS})
 target_link_libraries(QtGStreamerQML
     ${QTGSTREAMER_UI_LIBRARIES}
diff --git a/tests/auto/CMakeLists.txt b/tests/auto/CMakeLists.txt
index 147cd4a..a9fcca0 100644
--- a/tests/auto/CMakeLists.txt
+++ b/tests/auto/CMakeLists.txt
@@ -1,5 +1,5 @@
-include_directories(${CMAKE_CURRENT_BINARY_DIR} ${GSTREAMER_INCLUDE_DIR}
-                    ${GLIB2_INCLUDE_DIR} ${QTGSTREAMER_INCLUDES})
+include_directories(${GSTREAMER_INCLUDE_DIR} ${GLIB2_INCLUDE_DIR}
+                    ${QTGSTREAMER_INCLUDES})
 add_definitions(${QTGSTREAMER_DEFINITIONS} -DGST_DISABLE_XML -DGST_DISABLE_LOADSAVE)
 add_definitions(-DSRCDIR="${CMAKE_CURRENT_SOURCE_DIR}")
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${QTGSTREAMER_FLAGS}")
diff --git a/tests/manual/CMakeLists.txt b/tests/manual/CMakeLists.txt
index a51ef3e..64d5e86 100644
--- a/tests/manual/CMakeLists.txt
+++ b/tests/manual/CMakeLists.txt
@@ -1,4 +1,4 @@
-include_directories(${CMAKE_CURRENT_BINARY_DIR} ${QTGSTREAMER_INCLUDES})
+include_directories(${QTGSTREAMER_INCLUDES})
 add_definitions(${QTGSTREAMER_DEFINITIONS})
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${QTGSTREAMER_FLAGS}")