[CMake] Clean packaging.

CMakeLists.txt

@@ -113,7 +113,6 @@ INSTALL(FILES fonts/arial.ttf
 )
 
 FIND_PACKAGE(X11 REQUIRED)
-INCLUDE_DIRECTORIES(SYSTEM ${X11_INCLUDE_DIR})
 FIND_PACKAGE(OpenGL REQUIRED)
 
 ADD_REQUIRED_DEPENDENCY("openscenegraph >= 3.2")
@@ -154,7 +153,6 @@ ENDIF(GEPETTO_GUI_HAS_PYTHONQT)
 
 SET(BOOST_COMPONENTS ${BOOST_COMPONENTS} unit_test_framework system)
 SEARCH_FOR_BOOST()
-INCLUDE_DIRECTORIES(SYSTEM ${Boost_INCLUDE_DIRS})
 
 # Check if we are on a platform with ffmpeg or avconv
 FIND_PROGRAM(AVCONV avconv)

cmake-module/qt.cmake

 MACRO(ADD_QT_DEPENDENCY)
   IF(PROJECT_USE_QT4)
-    #FIND_PACKAGE(Qt4 REQUIRED QtXml)
     ADD_PROJECT_DEPENDENCY(Qt4 REQUIRED QtCore QtGui QtOpenGL QtNetwork QtXml)
     SET(PROJECT_QT_LIBS Qt4::QtCore Qt4::QtGui Qt4::QtOpenGL Qt4::QtNetwork Qt4::QtXml)
     SET(GEPETTO_VIEWER_QTVERSION "${QT_VERSION_MAJOR}.${QT_VERSION_MINOR}.${QT_VERSION_PATCH}")
     INCLUDE(${QT_USE_FILE})
-    SET(PROJECT_QT_INCLUDE_DIRS ${QT_INCLUDE_DIRS})
+    SET(PACKAGE_EXTRA_MACROS "include(${QT_USE_FILE})\n${PACKAGE_EXTRA_MACROS}")
   ELSE()
     FOREACH (component "Xml" "Core" "Widgets" "Gui" "OpenGL" "Network" "Concurrent")
       ADD_PROJECT_DEPENDENCY ("Qt5${component}" REQUIRED)
-      LIST(APPEND PROJECT_QT_INCLUDE_DIRS ${Qt5${component}_INCLUDE_DIRS})
       LIST(APPEND PROJECT_QT_LIBS Qt5::${component})
     ENDFOREACH ()
     SET(GEPETTO_VIEWER_QTVERSION "${Qt5Core_VERSION}")
@@ -20,6 +18,4 @@ MACRO(ADD_QT_DEPENDENCY)
   SET(CMAKE_INCLUDE_CURRENT_DIR ON)
   SET(CMAKE_AUTOMOC ON)
   SET(CMAKE_AUTOUIC ON)
-
-  INCLUDE_DIRECTORIES(SYSTEM ${PROJECT_QT_INCLUDE_DIRS})
 ENDMACRO(ADD_QT_DEPENDENCY)

src/CMakeLists.txt

@@ -145,6 +145,9 @@ TARGET_LINK_LIBRARIES(${LIBRARY_NAME} PUBLIC
 TARGET_INCLUDE_DIRECTORIES(${LIBRARY_NAME} PUBLIC
   $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/include>
   $<INSTALL_INTERFACE:include>)
+TARGET_INCLUDE_DIRECTORIES(${LIBRARY_NAME} SYSTEM PRIVATE
+  ${Boost_INCLUDE_DIRS}
+  ${X11_INCLUDE_DIR})
 IF(GEPETTO_GUI_HAS_PYTHONQT)
   TARGET_LINK_BOOST_PYTHON(${LIBRARY_NAME})
 ENDIF(GEPETTO_GUI_HAS_PYTHONQT)