From 6820e1b5c4eddc5bf3942c4966db6fccd70a5ba0 Mon Sep 17 00:00:00 2001
From: Guillaume Damiand <guillaume.damiand@liris.cnrs.fr>
Date: Tue, 28 Jun 2016 11:30:18 +0200
Subject: [PATCH] Reorder the cmake directive to retreive the same original
 order

---
 CGAL_ImageIO/src/CGAL_ImageIO/CMakeLists.txt | 9 ++++++---
 GraphicsView/src/CGAL_Qt5/CMakeLists.txt     | 9 +++++----
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/CGAL_ImageIO/src/CGAL_ImageIO/CMakeLists.txt b/CGAL_ImageIO/src/CGAL_ImageIO/CMakeLists.txt
index 2c0507f9721..01e96863032 100644
--- a/CGAL_ImageIO/src/CGAL_ImageIO/CMakeLists.txt
+++ b/CGAL_ImageIO/src/CGAL_ImageIO/CMakeLists.txt
@@ -21,16 +21,19 @@ use_essential_libs()
 
 if (CGAL_HEADER_ONLY)
   cache_set(CGAL_ImageIO_3RD_PARTY_INCLUDE_DIRS ${CGAL_ImageIO_3RD_PARTY_INCLUDE_DIRS} ${CMAKE_CURRENT_SOURCE_DIR})
+else()
+  include_directories( SYSTEM ${CGAL_3RD_PARTY_INCLUDE_DIRS} ${CGAL_ImageIO_3RD_PARTY_INCLUDE_DIRS} .)
+  link_directories   ( ${CGAL_LIBRARIES_DIR} ${CGAL_3RD_PARTY_LIBRARIES_DIRS} )  
 endif()
 
 collect_cgal_library( CGAL_ImageIO "")
 
 if (NOT CGAL_HEADER_ONLY)
-  add_definitions( ${CGAL_3RD_PARTY_DEFINITIONS} ${CGAL_ImageIO_3RD_PARTY_DEFINITIONS} )
-  include_directories( SYSTEM ${CGAL_3RD_PARTY_INCLUDE_DIRS} ${CGAL_ImageIO_3RD_PARTY_INCLUDE_DIRS} .)
-  link_directories    ( ${CGAL_LIBRARIES_DIR} ${CGAL_3RD_PARTY_LIBRARIES_DIRS} )
+
   add_dependencies( CGAL_ImageIO CGAL )
 
+  add_definitions( ${CGAL_3RD_PARTY_DEFINITIONS} ${CGAL_ImageIO_3RD_PARTY_DEFINITIONS} )
+
   # CGAL_ImageIO only depends on CGAL in DEBUG, but we still link it
   # in both build types.
   target_link_libraries( CGAL_ImageIO CGAL ${CGAL_3RD_PARTY_LIBRARIES} ${CGAL_ImageIO_3RD_PARTY_LIBRARIES} )
diff --git a/GraphicsView/src/CGAL_Qt5/CMakeLists.txt b/GraphicsView/src/CGAL_Qt5/CMakeLists.txt
index fec23aac3a0..6062f817cec 100644
--- a/GraphicsView/src/CGAL_Qt5/CMakeLists.txt
+++ b/GraphicsView/src/CGAL_Qt5/CMakeLists.txt
@@ -84,15 +84,16 @@ endif(CGAL_HEADER_ONLY)
 collect_cgal_library( CGAL_Qt5 "${additional_files}")
 
 if (NOT CGAL_HEADER_ONLY)
-  add_definitions ( ${CGAL_3RD_PARTY_DEFINITIONS} ${CGAL_Qt5_3RD_PARTY_DEFINITIONS} )
+
+  qt5_use_modules(CGAL_Qt5 OpenGL Svg)
+
+  add_dependencies( CGAL_Qt5 CGAL )
 
    # CGAL_Qt5 only depends on CGAL in DEBUG, but we still link it in
    # both build types.
    target_link_libraries( CGAL_Qt5 CGAL ${CGAL_3RD_PARTY_LIBRARIES} ${CGAL_Qt5_3RD_PARTY_LIBRARIES} )
 
-   qt5_use_modules(CGAL_Qt5 OpenGL Svg)
-
-   add_dependencies( CGAL_Qt5 CGAL )
+   add_definitions ( ${CGAL_3RD_PARTY_DEFINITIONS} ${CGAL_Qt5_3RD_PARTY_DEFINITIONS} )
 
 else()