From 13e49f054a4df59befff2a52f2501dc7f7d7dd85 Mon Sep 17 00:00:00 2001
From: Joao Carreira <jfmcarreira@gmail.com>
Date: Fri, 20 Nov 2015 19:39:08 +0000
Subject: [PATCH] Change some include dirs in the CMakeLists

---
 CMakeLists.txt         |  4 +++-
 app/CMakeLists.txt     | 10 ++++------
 app/ModulesHandle.cpp  |  2 +-
 lib/CMakeLists.txt     |  2 +-
 modules/CMakeLists.txt |  2 +-
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9a1ff00..1b76547 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -129,6 +129,9 @@ SET( CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O2" )
 ADD_FEATURE_INFO(PlaYUVerApp     PLAYUVER_BUILD_TOOLS    "Build Graphical Interface")
 ADD_FEATURE_INFO(PlaYUVerTools   PLAYUVER_BUILD_APP      "Build Command line tool"  )
 
+INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} )
+CONFIGURE_FILE( ${CMAKE_CURRENT_SOURCE_DIR}/config.h.in ${CMAKE_CURRENT_BINARY_DIR}/config.h )
+
 ADD_SUBDIRECTORY( lib )
 ADD_SUBDIRECTORY( modules )
 
@@ -144,7 +147,6 @@ IF( ${PLAYUVER_BUILD_EXEMPLES} )
   ADD_SUBDIRECTORY( examples )
 ENDIF()
 
-CONFIGURE_FILE( ${CMAKE_CURRENT_SOURCE_DIR}/config.h.in ${CMAKE_CURRENT_BINARY_DIR}/config.h )
 
 ######################################################################################
 # Final information dump
diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt
index bb62784..333293f 100644
--- a/app/CMakeLists.txt
+++ b/app/CMakeLists.txt
@@ -3,12 +3,10 @@
 ###
 
 # This is hard way - please fix
-INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_BINARY_DIR}/../
-                     ${CMAKE_CURRENT_SOURCE_DIR}
-                     ${CMAKE_CURRENT_SOURCE_DIR}/../
-                     ${CMAKE_CURRENT_SOURCE_DIR}/external
-                     ${CMAKE_CURRENT_SOURCE_DIR}/../modules
-                     ${CMAKE_CURRENT_BINARY_DIR}/../modules )
+INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR}/external )
+
+# ${CMAKE_CURRENT_SOURCE_DIR}/../modules
+#                      ${CMAKE_CURRENT_BINARY_DIR}/../modules
 
 #####################################################################################
 # Qt library
diff --git a/app/ModulesHandle.cpp b/app/ModulesHandle.cpp
index 5ae2d6f..ab4c095 100644
--- a/app/ModulesHandle.cpp
+++ b/app/ModulesHandle.cpp
@@ -28,9 +28,9 @@
 #include "PlaYUVerSubWindowHandle.h"
 #include "VideoSubWindow.h"
 #include "VideoHandle.h"
-#include "PlaYUVerModuleFactory.h"
 #include "DialogSubWindowSelector.h"
 #include "ModulesHandleOptDialog.h"
+#include "modules/PlaYUVerModuleFactory.h"
 
 namespace plaYUVer
 {
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index ed0ba4a..c812ad0 100644
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -2,7 +2,7 @@
 ### CMakeLists for playuver lib component
 ###
 
-INCLUDE_DIRECTORIES( ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}/../ )
+INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR} )
 
 set(plaYUver_Lib_SRCS
     # Frame
diff --git a/modules/CMakeLists.txt b/modules/CMakeLists.txt
index 0460240..e4d0c58 100644
--- a/modules/CMakeLists.txt
+++ b/modules/CMakeLists.txt
@@ -4,7 +4,7 @@
 
 OPTION( MODULE_THREADED_MODULES "Use threads for modules"  OFF )
 
-INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR}/../ ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}/../ )
+INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} )
 
 set(plaYUver_Mod_SRCS
   PlaYUVerModuleFactory.cpp