diff --git a/Installation/cmake/modules/CGAL_SetupFlags.cmake b/Installation/cmake/modules/CGAL_SetupFlags.cmake
index 01f2cad49bc..485e00300ff 100644
--- a/Installation/cmake/modules/CGAL_SetupFlags.cmake
+++ b/Installation/cmake/modules/CGAL_SetupFlags.cmake
@@ -57,7 +57,8 @@ if ( CGAL_DEBUG )
   endif()
 endif()
 
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CGAL_CXX_FLAGS}")  
+set(CMAKE_CXX_FLAGS_INIT "${CMAKE_CXX_FLAGS}")  
+set(CMAKE_CXX_FLAGS      "${CMAKE_CXX_FLAGS} ${CGAL_CXX_FLAGS}")  
 
 if ( BUILD_SHARED_LIBS )
   
@@ -75,7 +76,7 @@ if ( BUILD_SHARED_LIBS )
     set(CMAKE_SHARED_LINKER_FLAGS_DEBUG      "${CMAKE_SHARED_LINKER_FLAGS_DEBUG} ${CGAL_SHARED_LINKER_FLAGS_DEBUG}")
   endif()
   
-  set(CMAKE_SHARED_LINKER_FLAGS_INIT "${CMAKE_SHARED_LINKER_FLAGS} ${CGAL_SHARED_LINKER_FLAGS}")
+  set(CMAKE_SHARED_LINKER_FLAGS_INIT "${CMAKE_SHARED_LINKER_FLAGS}")
   set(CMAKE_SHARED_LINKER_FLAGS      "${CMAKE_SHARED_LINKER_FLAGS} ${CGAL_SHARED_LINKER_FLAGS}")
 
 else()
@@ -95,7 +96,7 @@ else()
     set(CMAKE_MODULE_LINKER_FLAGS_DEBUG      "${CMAKE_MODULE_LINKER_FLAGS_DEBUG} ${CGAL_MODULE_LINKER_FLAGS_DEBUG}")
   endif()
   
-  set(CMAKE_MODULE_LINKER_FLAGS_INIT "${CMAKE_MODULE_LINKER_FLAGS} ${CGAL_MODULE_LINKER_FLAGS}")
+  set(CMAKE_MODULE_LINKER_FLAGS_INIT "${CMAKE_MODULE_LINKER_FLAGS}")
   set(CMAKE_MODULE_LINKER_FLAGS      "${CMAKE_MODULE_LINKER_FLAGS} ${CGAL_MODULE_LINKER_FLAGS}")
 
 endif()