diff --git a/.gitattributes b/.gitattributes
index 8820d624e46..8e5fa5f60c8 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1528,13 +1528,13 @@ Box_intersection_d/doc_tex/Box_intersection_d/fig/box_inters.pdf -text svneol=un
 Box_intersection_d/test/Box_intersection_d/benchmark.plot -text svneol=native#application/postscript
 CGALimageIO/src/CGALimageIO/CGALimageIO_71.vcproj eol=crlf
 CGALimageIO/src/CGALimageIO/CGALimageIO_80.vcproj eol=crlf
+CMake/FindCGAL.cmake.in -text
 CMake/UseCGAL.cmake.in -text
 CMake/cmake/modules/CGALcommon.cmake -text
 CMake/cmake/modules/CheckCXXFileRuns.cmake -text
 CMake/cmake/modules/CheckCXXSourceRuns.cmake -text
 CMake/cmake/modules/FindBOOST2.cmake -text
 CMake/cmake/modules/FindBOOST_PROGRAM_OPTIONS.cmake -text
-CMake/cmake/modules/FindCGAL.cmake -text
 CMake/cmake/modules/FindCGALDependencies.cmake -text
 CMake/cmake/modules/FindCGAL_CORE.cmake -text
 CMake/cmake/modules/FindCORE.cmake -text
@@ -1550,7 +1550,6 @@ CMake/cmake/modules/MacroCreateSingleSourceCGALProgram.cmake -text
 CMake/cmake/modules/MacroFindOptionalCGALDependency.cmake -text
 CMake/cmake/modules/MacroOptionalFindPackage.cmake -text
 CMake/cmake/modules/Qt3Macros.cmake -text
-CMake/cmake/modules/UseCGAL.cmake -text
 CMake/compiler_config.h.in -text
 Circular_kernel_2/Benchmarks/parser/Report.pdf -text svneol=unset#application/pdf
 Circular_kernel_2/Benchmarks/readme.doc -text svneol=unset#application/msword
diff --git a/CMake/CMakeLists.txt b/CMake/CMakeLists.txt
index ff35c61795f..a0aa1a5f059 100644
--- a/CMake/CMakeLists.txt
+++ b/CMake/CMakeLists.txt
@@ -12,14 +12,12 @@ project (CGAL CXX)
 #--------------------------------------------------------------------------------------------------
 
 # Where to look first for cmake modules, before ${CMAKE_ROOT}/Modules/ is checked
-set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CGAL_SOURCE_DIR} ${CGAL_SOURCE_DIR}/cmake/modules)
+set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CGAL_SOURCE_DIR}/cmake/modules)
 
 include(CGALcommon)
 include(GeneratorSpecificSettings)
 include(CheckCXXFileRuns)
-#include(LogCMakeVariables)
 #include(Qt3Macros)
-#include(AddFileDependencies)
 
 # CGAL version number
 # TODO: This should be parsed from the VERSION file
@@ -48,6 +46,7 @@ set(CGAL_CMAKE_INSTALL_DIR     	cmake/modules)
 set(CGAL_3RD_PARTY_DEFINITIONS)
 set(CGAL_3RD_PARTY_INCLUDE_DIRS)
 set(CGAL_3RD_PARTY_LIBRARIES)
+set(CGAL_3RD_PARTY_LIBRARIES_DIR)
 
 # This module finds dependent libraries: Boost, GMP, CORE, etc..
 # Updates CGAL_3RD_PARTY_* accordingly
@@ -94,7 +93,7 @@ foreach(config_test_cpp ${all_config_tests})
     endif()
 endforeach()
 
-CONFIGURE_FILE(${CGAL_SOURCE_DIR}/compiler_config.h.in ${CGAL_BINARY_DIR}/include/CGAL/compiler_config.h @ONLY IMMEDIATE)
+configure_file(${CGAL_SOURCE_DIR}/compiler_config.h.in ${CGAL_BINARY_DIR}/include/CGAL/compiler_config.h @ONLY IMMEDIATE)
                
 
 #--------------------------------------------------------------------------------------------------
@@ -132,7 +131,7 @@ set(BUILD_TESTING OFF CACHE BOOL "Turn testing on/off")
 # MARK_AS_ADVANCED(DART_ROOT TCL_TCLSH)
 if(BUILD_TESTING)
     ENABLE_TESTING()
-#     CONFIGURE_FILE(${CGAL_SOURCE_DIR}/CMake/CTestCustom.ctest.in ${CGAL_BINARY_DIR}/CMake/CTestCustom.ctest @ONLY)
+#     configure_file(${CGAL_SOURCE_DIR}/CMake/CTestCustom.ctest.in ${CGAL_BINARY_DIR}/CMake/CTestCustom.ctest @ONLY)
 #     FILE(WRITE ${CGAL_BINARY_DIR}/CTestCustom.cmake "INCLUDE(\"${CGAL_BINARY_DIR}/CMake/CTestCustom.ctest\")\n")
 endif()
 
@@ -165,15 +164,15 @@ endif()
 
 # DESTINATION option is mandatory; skipping it breaks CPack!
 
-INSTALL(FILES CHANGES "INSTALL" INSTALL.MacOSX INSTALL.win32
+install(FILES CHANGES "INSTALL" INSTALL.MacOSX INSTALL.win32
 	            LICENSE LICENSE.FREE_USE LICENSE.LGPL LICENSE.QPL
 	            README "VERSION"  
 	      DESTINATION ${CGAL_INSTALL_DIR}
        )
 
-INSTALL(DIRECTORY "include/CGAL" DESTINATION ${CGAL_INCLUDE_INSTALL_DIR} )
-INSTALL(DIRECTORY "auxiliary"    DESTINATION ${CGAL_AUXILIARY_INSTALL_DIR} )
-INSTALL(DIRECTORY "cmake"        DESTINATION ${CGAL_CMAKE_INSTALL_DIR} )
+install(DIRECTORY "include/CGAL" DESTINATION ${CGAL_INCLUDE_INSTALL_DIR} )
+install(DIRECTORY "auxiliary"    DESTINATION ${CGAL_AUXILIARY_INSTALL_DIR} )
+install(DIRECTORY "cmake"        DESTINATION ${CGAL_CMAKE_INSTALL_DIR} )
 
 
 
@@ -184,10 +183,12 @@ INSTALL(DIRECTORY "cmake"        DESTINATION ${CGAL_CMAKE_INSTALL_DIR} )
 #
 #--------------------------------------------------------------------------------------------------
 
-CONFIGURE_FILE(${CGAL_SOURCE_DIR}/UseCGAL.cmake.in ${CGAL_BINARY_DIR}/cmake/modules/UseCGAL.cmake @ONLY IMMEDIATE)
-INSTALL( FILES ${CGAL_BINARY_DIR}/UseCGAL.cmake DESTINATION ${CGAL_CMAKE_INSTALL_DIR})
-
+configure_file(${CGAL_SOURCE_DIR}/FindCGAL.cmake.in ${CGAL_BINARY_DIR}/cmake/modules/FindCGAL.cmake @ONLY IMMEDIATE)
+configure_file(${CGAL_SOURCE_DIR}/UseCGAL.cmake.in  ${CGAL_BINARY_DIR}/cmake/modules/UseCGAL.cmake  @ONLY IMMEDIATE)
 
+install( FILES ${CGAL_BINARY_DIR}/cmake/modules/FindCGAL.cmake ${CGAL_BINARY_DIR}/cmake/modules/FindCGAL.cmake
+         DESTINATION ${CMAKE_ROOT}/Modules
+       )  
 
 
 #--------------------------------------------------------------------------------------------------
@@ -240,3 +241,4 @@ IF(EXISTS "${CMAKE_ROOT}/Modules/CPack.cmake")
 
     INCLUDE(CPack)
 ENDIF(EXISTS "${CMAKE_ROOT}/Modules/CPack.cmake")
+
diff --git a/CMake/FindCGAL.cmake.in b/CMake/FindCGAL.cmake.in
new file mode 100644
index 00000000000..723ea8fd43e
--- /dev/null
+++ b/CMake/FindCGAL.cmake.in
@@ -0,0 +1,76 @@
+# Try to find the CGAL libraries
+# CGAL_FOUND             - system has CGAL lib
+# CGAL_INCLUDE_DIR       - the CGAL include directory 
+# CGAL_LIBRARIES_DIR     - the CGAL libraries directory
+# CGAL_LIBRARIES         - the CGAL libraries 
+# CGAL_CMAKE_MODULE_PATH - the directory containing CGAL related CMake stuff
+
+# CGAL_ROOT              - set to the enviroment variable CGALROOT, IF defined (can be empty)
+
+# If found, the folder containing the CGAL-specific CMake stuff is added to CMAKE_MODULE_PATH
+
+set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS true)
+
+if ( NOT CGAL_INCLUDE_DIRS OR NOT CGAL_LIBRARIES_DIRS OR NOT CGAL_CMAKE_MODULE_PATH )
+
+  set(CGAL_ROOT $ENV{CGALROOT})
+
+  if(CGAL_ROOT)
+    file(TO_CMAKE_PATH ${CGAL_ROOT} CGAL_ROOT)
+  endif()
+
+  find_path(CGAL_INCLUDE_DIR 
+            NAMES CGAL/basic.h
+            PATHS ../../include ${CGAL_ROOT}/include
+        	  DOC "The directories containing include files for CGAL"
+           )
+           
+  find_path(CGAL_CMAKE_MODULE_PATH CGALcommon.cmake
+            PATHS ../../cmake/modules ${CGAL_ROOT}/cmake/modules ${CMAKE_MODULE_PATH}
+        	  DOC "The directories containing CGAL CMake stuff"
+           )
+
+  if ( "${CMAKE_GENERATOR}" MATCHES "Visual Studio" )
+
+    if ( "${CMAKE_GENERATOR}" MATCHES "2003" )
+      set(TOOLSET "-vc71")
+    elseif ( "${CMAKE_GENERATOR}" MATCHES "2005" )  
+      set(TOOLSET "-vc80")
+    elseif ( "${CMAKE_GENERATOR}" MATCHES "2008" )  
+      set(TOOLSET "-vc90")
+    endif()
+    
+    find_path(CGAL_LIBRARIES_DIR 
+              NAMES "cgal${TOOLSET}-mt.lib" "cgal${TOOLSET}-mt-gd.lib" "cgal${TOOLSET}-mt-o.lib" "cgal${TOOLSET}-mt-g.lib"
+              PATHS ../../lib ${CGAL_ROOT}/lib
+         	    DOC "Path to CGAL and third-party libraries"
+             ) 
+
+    set(CGAL_LIBRARIES "") 
+    
+  else()
+
+    find_library(CGAL_LIBRARIES NAMES CGAL
+                 PATHS ../../lib ${CGAL_ROOT}/lib
+           	     DOC "CGAL libraries"
+                )
+                
+    get_filename_component(CGAL_LIBRARIES_DIR ${CGAL_LIBRARIES} PATH)
+              
+  endif()
+  
+endif()
+
+if ( CGAL_INCLUDE_DIR AND CGAL_LIBRARIES_DIR AND CGAL_CMAKE_MODULE_PATH )
+  set( CGAL_FOUND TRUE )
+  set( CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CGAL_CMAKE_MODULE_PATH})
+else()
+  if ( CGAL_FIND_REQUIRED)
+    message(FATAL_ERROR "Could NOT find CGAL")
+  else()
+    if (NOT CGAL_FIND_QUIETLY)
+      message(STATUS "Could NOT find CGAL")
+    endif()
+  endif()  
+endif()
+
diff --git a/CMake/UseCGAL.cmake.in b/CMake/UseCGAL.cmake.in
index 6c736dafa9f..2ebd5140185 100644
--- a/CMake/UseCGAL.cmake.in
+++ b/CMake/UseCGAL.cmake.in
@@ -13,26 +13,26 @@ set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS true)
 if(NOT USE_CGAL_FILE_INCLUDED) 
   set(USE_CGAL_FILE_INCLUDED 1)
 
-  include(CGALcommon)
-  include(GeneratorSpecificSettings)
+  include(CGALcommon OPTIONAL )
+  include(GeneratorSpecificSettings OPTIONAL)
   
   #
   # The following variables are hard coded here at configuration time
   #
-  set(CGAL_MAJOR_VERSION           "@CGAL_MAJOR_VERSION@")
-  set(CGAL_MINOR_VERSION           "@CGAL_MINOR_VERSION@")
-  set(CGAL_BUILD_VERSION           "@CGAL_BUILD_VERSION@")
-  set(CGAL_BINARY_DIR              "@CGAL_BINARY_DIR@")
-  set(CGAL_INSTALL_DIR	           "@CMAKE_INSTALL_PREFIX@/@CGAL_INSTALL_DIR@")
-  set(CGAL_LIB_INSTALL_DIR	       "@CMAKE_INSTALL_PREFIX@/@CGAL_LIB_INSTALL_DIR@")
-  set(CGAL_INCLUDE_INSTALL_DIR     "@CMAKE_INSTALL_PREFIX@/@CGAL_INCLUDE_INSTALL_DIR@")
-  set(CGAL_BIN_INSTALL_DIR	       "@CMAKE_INSTALL_PREFIX@/@CGAL_BIN_INSTALL_DIR@")
-  set(CGAL_AUXILIARY_INSTALL_DIR   "@CMAKE_INSTALL_PREFIX@/@CGAL_AUXILIARY_INSTALL_DIR@")
-  set(CGAL_MODULE_INSTALL_DIR	     "@CMAKE_INSTALL_PREFIX@/@CGAL_MODULE_INSTALL_DIR@")
-  set(CGAL_3RD_PARTY_INCLUDE_DIRS  "@CGAL_3RD_PARTY_INCLUDE_DIRS@")
-  set(CGAL_3RD_PARTY_DEFINITIONS   "@CGAL_3RD_PARTY_DEFINITIONS@")
-  set(CGAL_3RD_PARTY_LIBRARIES_DIR "@CGAL_3RD_PARTY_LIBRARIES_DIR@")
-  set(CGAL_3RD_PARTY_LIBRARIES     "@CGAL_3RD_PARTY_LIBRARIES@")
+  set(CGAL_MAJOR_VERSION            "@CGAL_MAJOR_VERSION@")
+  set(CGAL_MINOR_VERSION            "@CGAL_MINOR_VERSION@")
+  set(CGAL_BUILD_VERSION            "@CGAL_BUILD_VERSION@")
+  set(CGAL_BINARY_DIR               "@CGAL_BINARY_DIR@")
+  set(CGAL_INSTALL_DIR	            "@CMAKE_INSTALL_PREFIX@/@CGAL_INSTALL_DIR@")
+  set(CGAL_LIB_INSTALL_DIR	        "@CMAKE_INSTALL_PREFIX@/@CGAL_LIB_INSTALL_DIR@")
+  set(CGAL_INCLUDE_INSTALL_DIR      "@CMAKE_INSTALL_PREFIX@/@CGAL_INCLUDE_INSTALL_DIR@")
+  set(CGAL_BIN_INSTALL_DIR	        "@CMAKE_INSTALL_PREFIX@/@CGAL_BIN_INSTALL_DIR@")
+  set(CGAL_AUXILIARY_INSTALL_DIR    "@CMAKE_INSTALL_PREFIX@/@CGAL_AUXILIARY_INSTALL_DIR@")
+  set(CGAL_MODULE_INSTALL_DIR	      "@CMAKE_INSTALL_PREFIX@/@CGAL_MODULE_INSTALL_DIR@")
+  set(CGAL_3RD_PARTY_INCLUDE_DIRS   "@CGAL_3RD_PARTY_INCLUDE_DIRS@")
+  set(CGAL_3RD_PARTY_DEFINITIONS    "@CGAL_3RD_PARTY_DEFINITIONS@")
+  set(CGAL_3RD_PARTY_LIBRARIES_DIRS "@CGAL_3RD_PARTY_LIBRARIES_DIRS@")
+  set(CGAL_3RD_PARTY_LIBRARIES      "@CGAL_3RD_PARTY_LIBRARIES@")
   
   #
   # The following variables may have previous values comming from find_package(CGAL).
@@ -42,15 +42,13 @@ if(NOT USE_CGAL_FILE_INCLUDED)
   set(CGAL_DEFINITIONS  ${CGAL_DEFINITIONS}  "@CGAL_DEFINITIONS@")
   set(CGAL_LIBRARIES    ${CGAL_LIBRARIES}    "@CGAL_LIBRARIES@")
   
-  set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CGAL_MODULE_INSTALL_DIR} ${CGAL_CMAKE_MODULE_PATH} )
-
   include_directories (${CGAL_INCLUDE_DIRS})
   include_directories (${CGAL_3RD_PARTY_INCLUDE_DIRS})
 
   add_definitions(${CGAL_DEFINITIONS})
   add_definitions(${CGAL_3RD_PARTY_DEFINITIONS})
   
-  link_directories( ${CGAL_LIB_INSTALL_DIR} ${CGAL_3RD_PARTY_LIBRARIES_DIR} )
+  link_directories( ${CGAL_LIB_INSTALL_DIR} ${CGAL_LIBRARIES_DIR} ${CGAL_3RD_PARTY_LIBRARIES_DIRS} )
   
   set(CGAL_VERSION"${CGAL_MAJOR_VERSION}.${CGAL_MINOR_VERSION}.${CGAL_BUILD_VERSION}")
   
diff --git a/CMake/cmake/modules/CMakeLists.txt b/CMake/cmake/modules/CMakeLists.txt
deleted file mode 100644
index 5fa54ffe890..00000000000
--- a/CMake/cmake/modules/CMakeLists.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-# cmake/modules/CMakeLists.txt
-#
-# Install CGAL CMake macros.
-
-INSTALL(FILES FindCGAL.cmake DESTINATION ${CMAKE_ROOT}/Modules)
-
-
-
diff --git a/CMake/cmake/modules/FindCGAL.cmake b/CMake/cmake/modules/FindCGAL.cmake
deleted file mode 100644
index ffb69a3c015..00000000000
--- a/CMake/cmake/modules/FindCGAL.cmake
+++ /dev/null
@@ -1,58 +0,0 @@
-# Try to find the CGAL libraries
-# CGAL_FOUND             - system has CGAL lib
-# CGAL_INCLUDE_DIR       - the CGAL include directory 
-# CGAL_LIBRARIES         - the CGAL libraries 
-# CGAL_LIBRARIESDIR      - the CGAL libraries directory
-# CGAL_CMAKE_MODULE_PATH - the directory containing CGAL related CMake stuff
-
-# CGAL_ROOT              - set to the enviroment variable CGALROOT, IF defined
-
-include(FindPackageHandleStandardArgs)
-include(GeneratorSpecificSettings)
-
-if (CGAL_INCLUDE_DIRS AND CGAL_LIBRARIES )
-  # Already in cache, be silent
-  set(CGAL_FIND_QUIETLY TRUE)
-endif()
-
-set(CGAL_ROOT $ENV{CGALROOT})
-
-if(CGAL_ROOT)
-  FILE(TO_CMAKE_PATH ${CGAL_ROOT} CGAL_ROOT)
-endif()
-
-find_path(CGAL_INCLUDE_DIR 
-          NAMES CGAL/basic.h
-          PATHS ../../include ${CGAL_ROOT}/include
-      	  DOC "The directories containing include files for CGAL"
-         )
-         
-find_path(CGAL_CMAKE_MODULE_PATH CGALcommon.cmake
-          PATHS ../../cmake/modules ${CGAL_ROOT}/cmake/modules ${CMAKE_MODULE_PATH}
-      	  DOC "The directories containing CGAL CMake stuff"
-         )
-
-if ( "${CMAKE_GENERATOR}" MATCHES "Visual Studio" )
-
-  find_path(CGAL_LIBRARIES_DIR 
-            NAMES "cgal${TOOLSET}-mt.lib" "cgal${TOOLSET}-mt-gd.lib" "cgal${TOOLSET}-mt-o.lib" "cgal${TOOLSET}-mt-g.lib"
-            PATHS ../../lib ${CGAL_ROOT}/lib
-       	    DOC "Path to CGAL and third-party libraries"
-           ) 
-
-  set(CGAL_LIBRARIES "") 
-  
-  FIND_PACKAGE_HANDLE_STANDARD_ARGS(CGAL "DEFAULT_MSG" CGAL_LIBRARIES_DIR CGAL_INCLUDE_DIR CGAL_CMAKE_MODULE_PATH)
-  
-else()
-
-  find_library(CGAL_LIBRARIES NAMES CGAL
-               PATHS ../../lib ${CGAL_ROOT}/lib
-         	     DOC "CGAL libraries"
-              )
-              
-  get_filename_component(CGAL_LIBRARIES_DIR ${CGAL_LIBRARIES} PATH)
-            
-  FIND_PACKAGE_HANDLE_STANDARD_ARGS(CGAL "DEFAULT_MSG" CGAL_LIBRARIES CGAL_INCLUDE_DIR CGAL_CMAKE_MODULE_PATH)
-endif()
-         
diff --git a/CMake/cmake/modules/FindCGALDependencies.cmake b/CMake/cmake/modules/FindCGALDependencies.cmake
index 9298654ac65..0e06af65878 100644
--- a/CMake/cmake/modules/FindCGALDependencies.cmake
+++ b/CMake/cmake/modules/FindCGALDependencies.cmake
@@ -12,8 +12,9 @@ endif()
 # If found:
 #   ABC_FOUND is set to TRUE
 #   CGAL_USE_ABC is set to 1
-#   CGAL_3RD_PARTY_INCLUDE_DIRS is added with ABC_INCLUDE_DIR
-#   CGAL_3RD_PARTY_LIBRARIES    is added with ABC_LIBRARIES
+#   CGAL_3RD_PARTY_INCLUDE_DIRS    is added with ABC_INCLUDE_DIR
+#   CGAL_3RD_PARTY_LIBRARIES_DIRS  is added with ABC_LIBRARIES_DIR
+#   CGAL_3RD_PARTY_LIBRARIES       is added with ABC_LIBRARIES
 
 find_optional_cgal_dependency(GMP)
 find_optional_cgal_dependency(MPFR)
diff --git a/CMake/cmake/modules/MacroFindOptionalCGALDependency.cmake b/CMake/cmake/modules/MacroFindOptionalCGALDependency.cmake
index 4f79aea1d5d..342f544cae0 100644
--- a/CMake/cmake/modules/MacroFindOptionalCGALDependency.cmake
+++ b/CMake/cmake/modules/MacroFindOptionalCGALDependency.cmake
@@ -3,9 +3,9 @@ include(MacroOptionalFindPackage)
 macro (find_optional_cgal_dependency _name )
   macro_optional_find_package(${_name})
   if(WITH_${_name} AND ${_name}_FOUND )
-    set(CGAL_3RD_PARTY_INCLUDE_DIRS    ${CGAL_3RD_PARTY_INCLUDE_DIRS}   ${${_name}_INCLUDE_DIR})
-    set(CGAL_3RD_PARTY_LIBRARIES_DIRS  ${CGAL_3RD_PARTY_LIBRARIES_DIR}  ${${_name}_LIBRARIES_DIR} )
-    set(CGAL_3RD_PARTY_LIBRARIES       ${CGAL_3RD_PARTY_LIBRARIES}      ${${_name}_LIBRARIES}  )
+    set(CGAL_3RD_PARTY_INCLUDE_DIRS    ${CGAL_3RD_PARTY_INCLUDE_DIRS}    ${${_name}_INCLUDE_DIR})
+    set(CGAL_3RD_PARTY_LIBRARIES_DIRS  ${CGAL_3RD_PARTY_LIBRARIES_DIRS}  ${${_name}_LIBRARIES_DIR} )
+    set(CGAL_3RD_PARTY_LIBRARIES       ${CGAL_3RD_PARTY_LIBRARIES}       ${${_name}_LIBRARIES}  )
     set(CGAL_USE_${_name} 1)
   endif()
 endmacro()
diff --git a/CMake/cmake/modules/UseCGAL.cmake b/CMake/cmake/modules/UseCGAL.cmake
deleted file mode 100644
index 3e6ef607bf1..00000000000
--- a/CMake/cmake/modules/UseCGAL.cmake
+++ /dev/null
@@ -1,57 +0,0 @@
-#
-# UseCGAL.cmake can be included in a project to load the needed compiler and linker
-# settings to use CGAL.
-#
-# Use find_package(CGAL) or CMAKE_INSTALL_DIR/CMAKE_BINARY_DIR parameters to locate UseCGAL.cmake.
-# If find_package(CGAL) is used, some of these settings will be already setup and appended here.
-#
-# DO NOT EDIT UseCGAL.cmake. It is generated by CMake from UseCGAL.cmake.in.
-#
-
-set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS true)
-
-if(NOT USE_CGAL_FILE_INCLUDED) 
-  set(USE_CGAL_FILE_INCLUDED 1)
-
-  include(CGALcommon)
-  include(GeneratorSpecificSettings)
-  
-  #
-  # The following variables are hard coded here at configuration time
-  #
-  set(CGAL_MAJOR_VERSION           "3")
-  set(CGAL_MINOR_VERSION           "4")
-  set(CGAL_BUILD_VERSION           "1")
-  set(CGAL_BINARY_DIR              "C:/Work/CGAL-3.4-I-140")
-  set(CGAL_INSTALL_DIR	           "C:/Program Files/CGAL/.")
-  set(CGAL_LIB_INSTALL_DIR	       "C:/Program Files/CGAL/lib")
-  set(CGAL_INCLUDE_INSTALL_DIR     "C:/Program Files/CGAL/include")
-  set(CGAL_BIN_INSTALL_DIR	       "C:/Program Files/CGAL/")
-  set(CGAL_AUXILIARY_INSTALL_DIR   "C:/Program Files/CGAL/auxiliary")
-  set(CGAL_MODULE_INSTALL_DIR	     "C:/Program Files/CGAL/")
-  set(CGAL_3RD_PARTY_INCLUDE_DIRS  "C:/Program Files/boost/boost_1_33_1;C:/Work/CGAL-3.4-I-140/auxiliary/gmp/include;C:/Work/CGAL-3.4-I-140/auxiliary/gmp/include;C:/Work/CGAL-3.4-I-140/include/CGAL/CORE")
-  set(CGAL_3RD_PARTY_DEFINITIONS   "")
-  set(CGAL_3RD_PARTY_LIBRARIES_DIR "")
-  set(CGAL_3RD_PARTY_LIBRARIES     "")
-  
-  #
-  # The following variables may have previous values comming from find_package(CGAL).
-  # Hard-coded values at configuration time are appended here.
-  #
-  set(CGAL_INCLUDE_DIRS ${CGAL_INCLUDE_DIRS} "C:/Work/CGAL-3.4-I-140/include")
-  set(CGAL_DEFINITIONS  ${CGAL_DEFINITIONS}  "-D_SECURE_SCL=0;-D_CRT_SECURE_NO_DEPRECATE;-DSCL_SECURE_NO_DEPRECATE")
-  set(CGAL_LIBRARIES    ${CGAL_LIBRARIES}    "")
-  
-  set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CGAL_MODULE_INSTALL_DIR} ${CGAL_CMAKE_MODULE_PATH} )
-
-  include_directories (${CGAL_INCLUDE_DIRS})
-  include_directories (${CGAL_3RD_PARTY_INCLUDE_DIRS})
-
-  add_definitions(${CGAL_DEFINITIONS})
-  add_definitions(${CGAL_3RD_PARTY_DEFINITIONS})
-  
-  link_directories( ${CGAL_LIB_INSTALL_DIR} ${CGAL_3RD_PARTY_LIBRARIES_DIR} )
-  
-  set(CGAL_VERSION"${CGAL_MAJOR_VERSION}.${CGAL_MINOR_VERSION}.${CGAL_BUILD_VERSION}")
-  
-endif()
diff --git a/CMake/src/CGAL/CMakeLists.txt b/CMake/src/CGAL/CMakeLists.txt
index c05b31e3799..604b70b2995 100644
--- a/CMake/src/CGAL/CMakeLists.txt
+++ b/CMake/src/CGAL/CMakeLists.txt
@@ -91,5 +91,5 @@ if ( AUTO_LINK_ENABLED )
   
 endif()
 
-INSTALL(TARGETS CGAL DESTINATION ${CGAL_LIB_INSTALL_DIR} )
+install(TARGETS CGAL DESTINATION ${CGAL_LIB_INSTALL_DIR} )