From 10af9912d93e78588f0e24597345f7cfbf29f0e9 Mon Sep 17 00:00:00 2001
From: Eric Berberich <eric.berberich@cgal.org>
Date: Tue, 10 Jan 2012 18:13:19 +0000
Subject: [PATCH] CGALcomponent libs are not own CMake projects anymore

---
 CGALimageIO/src/CGALImageIO/CMakeLists.txt | 24 ++++-----------
 Core/src/CGALCore/CMakeLists.txt           | 35 ++++++++-------------
 GraphicsView/src/CGALQt4/CMakeLists.txt    | 36 ++++++++--------------
 Qt_widget/src/CGALQt3/CMakeLists.txt       | 33 +++++++-------------
 4 files changed, 42 insertions(+), 86 deletions(-)

diff --git a/CGALimageIO/src/CGALImageIO/CMakeLists.txt b/CGALimageIO/src/CGALImageIO/CMakeLists.txt
index c0019a3e251..28e0d669a52 100644
--- a/CGALimageIO/src/CGALImageIO/CMakeLists.txt
+++ b/CGALimageIO/src/CGALImageIO/CMakeLists.txt
@@ -1,22 +1,7 @@
-project (CGAL_ImageIO)
-   
-# Minimal version of CMake:
-cmake_minimum_required(VERSION 2.6.2)
+message(STATUS "Configure libCGALImageIO")
 
-# Tested version:
-if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" VERSION_GREATER 2.6)
-  if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION}" VERSION_GREATER 2.8.3)
-    cmake_policy(VERSION 2.8.4)
-  else()
-    cmake_policy(VERSION 2.6)
-  endif()
-endif()
-
-if ( NOT CGAL_FOUND )   
-  find_package(CGAL REQUIRED COMPONENTS zlib OpenGL)
-endif()
-
-include(${CGAL_USE_FILE})
+find_package( OpenGL )
+find_package( zlib )
 
 #option(WITH_VTK "Add VTK support to the CGAL ImageIO library." OFF)
 
@@ -107,6 +92,8 @@ if(OPENGL_FOUND)
   if ( CGAL_INSTALL_LIB_DIR )
     install(TARGETS CGAL_ImageIO DESTINATION ${CGAL_INSTALL_LIB_DIR} )
   endif()
+
+message(STATUS "libCGALImageIO is configured")
     
 else(OPENGL_FOUND)
   message( STATUS "CGAL_ImageIO needs OpenGL, cannot be configured.")
@@ -115,3 +102,4 @@ endif(OPENGL_FOUND)
 if(NOT ZLIB_FOUND)
   message( STATUS "NOTICE: CGAL_ImageIO needs ZLib to read compressed files. That feature will not be activated.")
 endif(NOT ZLIB_FOUND) 
+
diff --git a/Core/src/CGALCore/CMakeLists.txt b/Core/src/CGALCore/CMakeLists.txt
index 603b75cac8e..9aece64e6ec 100644
--- a/Core/src/CGALCore/CMakeLists.txt
+++ b/Core/src/CGALCore/CMakeLists.txt
@@ -1,34 +1,21 @@
-project (CGAL_Core)
-   
-# Minimal version of CMake:
-cmake_minimum_required(VERSION 2.6.2)
-
-# Tested version:
-if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" VERSION_GREATER 2.6)
-  if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION}" VERSION_GREATER 2.8.3)
-    cmake_policy(VERSION 2.8.4)
-  else()
-    cmake_policy(VERSION 2.6)
-  endif()
+message(STATUS "Configure libCGALCore")
+ 
+use_lib( GMP "###")
+use_lib( MPFR "###")
+if (CGAL_USE_GMPXX) 
+  use_lib( GMPXX "###")
 endif()
 
-if ( NOT CGAL_FOUND )
-  # need CGAL with GMP
-  find_package(CGAL REQUIRED COMPONENTS GMP)
-endif()
+include_directories (${CGAL_3RD_PARTY_INCLUDE_DIRS})
 
-include(${CGAL_USE_FILE})
-
-include_directories( ${CGAL_3RD_PARTY_INCLUDE_DIRS} )
+add_definitions(${CGAL_3RD_PARTY_DEFINITIONS})
 
 build_cgal_library(CGAL_Core CGALCore "")
+ 
+target_link_libraries( CGAL_Core ${CGAL_LIBRARY} ${CGAL_3RD_PARTY_LIBRARIES} )
 
 add_dependencies( CGAL_Core CGAL )
 
-add_definitions ( ${CGAL_3RD_PARTY_DEFINITIONS} )
-  
-target_link_libraries( CGAL_Core ${CGAL_LIBRARY} ${CGAL_3RD_PARTY_LIBRARIES} )
-
 set_target_properties(CGAL_Core PROPERTIES VERSION "${CGAL_SOVERSION}" SOVERSION "${CGAL_SONAME_VERSION}")
 
 set( CGAL_Core_BASENAME CGAL_Core )
@@ -70,3 +57,5 @@ if ( CGAL_INSTALL_LIB_DIR )
   install(TARGETS CGAL_Core DESTINATION ${CGAL_INSTALL_LIB_DIR} )
 endif()
 
+message(STATUS "libCGALCore is configured")
+
diff --git a/GraphicsView/src/CGALQt4/CMakeLists.txt b/GraphicsView/src/CGALQt4/CMakeLists.txt
index a6d8ec555eb..bd5820d549d 100644
--- a/GraphicsView/src/CGALQt4/CMakeLists.txt
+++ b/GraphicsView/src/CGALQt4/CMakeLists.txt
@@ -1,22 +1,4 @@
-project (CGAL_Qt4)
-
-# Minimal version of CMake:
-cmake_minimum_required(VERSION 2.6.2)
-
-# Tested version:
-if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" VERSION_GREATER 2.6)
-  if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION}" VERSION_GREATER 2.8.3)
-    cmake_policy(VERSION 2.8.4)
-  else()
-    cmake_policy(VERSION 2.6)
-  endif()
-endif()
-
-if ( NOT CGAL_FOUND )   
-  find_package(CGAL REQUIRED COMPONENTS Qt4 GMP GMPXX MPFR)
-endif()
-
-include(${CGAL_USE_FILE})
+message(STATUS "Configure libCGALQt4")
 
 set( QT_USE_QTMAIN   TRUE )
 set( QT_USE_QTOPENGL TRUE )
@@ -78,15 +60,21 @@ if( QT4_FOUND )
 
 #    message(STATUS "Additional input files: ${additional_files}")
 
+    use_lib( GMP "###")
+    use_lib( MPFR "###")
+    if (CGAL_USE_GMPXX) 
+      use_lib( GMPXX "###")
+    endif()
+
+    include_directories( ${CGAL_3RD_PARTY_INCLUDE_DIRS} ${CGAL_Qt4_3RD_PARTY_INCLUDE_DIRS} )
+
     build_cgal_library( CGAL_Qt4 CGALQt4 "${additional_files}")
 
-    if ( NOT CGAL_IS_CURRENT_SCRIPT_TOP_LEVEL )
-      add_dependencies( CGAL_Qt4 CGAL )
-    endif()    
+    add_dependencies( CGAL_Qt4 CGAL )
 
     target_link_libraries( CGAL_Qt4 ${CGAL_LIBRARY} ${CGAL_3RD_PARTY_LIBRARIES} ${CGAL_Qt4_3RD_PARTY_LIBRARIES} )
 
-    add_definitions ( ${CGAL_3RD_PARTY_DEFINITIONS} )
+    add_definitions ( ${CGAL_3RD_PARTY_DEFINITIONS} ${CGAL_Qt4_3RD_PARTY_DEFINITIONS} )
 
     if($ENV{CGAL_FAKE_PUBLIC_RELEASE})
       add_definitions( -DCGAL_FAKE_PUBLIC_RELEASE )
@@ -130,6 +118,8 @@ if( QT4_FOUND )
       install(TARGETS CGAL_Qt4 DESTINATION ${CGAL_INSTALL_LIB_DIR} )
     endif()
 
+    message(STATUS "libCGALQt4 is configured")
+
   else()
     message( STATUS "CGAL_Qt4 needs OpenGL, cannot be configured.")
   endif()  
diff --git a/Qt_widget/src/CGALQt3/CMakeLists.txt b/Qt_widget/src/CGALQt3/CMakeLists.txt
index ff111d9bbf4..8850b97c93c 100644
--- a/Qt_widget/src/CGALQt3/CMakeLists.txt
+++ b/Qt_widget/src/CGALQt3/CMakeLists.txt
@@ -1,25 +1,6 @@
-project (CGAL_Qt3)
-
-# Minimal version of CMake:
-cmake_minimum_required(VERSION 2.6.2)
-
-# Tested version:
-if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" VERSION_GREATER 2.6)
-  if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION}" VERSION_GREATER 2.8.3)
-    cmake_policy(VERSION 2.8.4)
-  else()
-    cmake_policy(VERSION 2.6)
-  endif()
-endif()
-
-if ( NOT CGAL_FOUND )
-  find_package(CGAL REQUIRED)
-endif()
-
-include(${CGAL_USE_FILE})
+message(STATUS "Configure libCGALQt3")
 
 find_package(OpenGL QUIET )
-
 find_package(Qt3-patched QUIET )
 # FindQt3-patched.cmake is FindQt3.cmake patched by CGAL developers, so
 # that it can be used together with FindQt4: all its variables are prefixed
@@ -29,7 +10,7 @@ if( QT3_FOUND )
 
   if( OPENGL_FOUND )
 
-    get_dependency_version(OPENGL)
+    get_dependency_version(OPENGL OpenGL)
     get_dependency_version(QT QT3)
     
     if(COMMAND add_config_flag)
@@ -37,7 +18,6 @@ if( QT3_FOUND )
       add_config_flag( CGAL_HAS_QT3 )
     endif()
     
-    message( STATUS "OpenGL include:     ${OPENGL_INCLUDE_DIR}" )
     message( STATUS "OpenGL include:     ${OPENGL_INCLUDE_DIR}" )
     message( STATUS "OpenGL libraries:   ${OPENGL_LIBRARIES}" )
     message( STATUS "OpenGL definitions: ${OPENGL_DEFINITIONS}" )
@@ -52,6 +32,12 @@ if( QT3_FOUND )
     cache_set(CGAL_Qt3_3RD_PARTY_DEFINITIONS  ${QT3_DEFINITIONS} ${OPENGL_DEFINITIONS} )
     
     include(Qt3Macros-patched)
+
+    use_lib( GMP "###")
+    use_lib( MPFR "###")
+    if (CGAL_USE_GMPXX) 
+      use_lib( GMPXX "###")
+    endif()
        
     include_directories( ${CGAL_3RD_PARTY_INCLUDE_DIRS} ${CGAL_Qt3_3RD_PARTY_INCLUDE_DIRS} )
 
@@ -129,6 +115,9 @@ if( QT3_FOUND )
       install(TARGETS CGAL_Qt3 DESTINATION ${CGAL_INSTALL_LIB_DIR} )
     endif()
 
+    message(STATUS "libCGALQt3 is configured")
+
+
   else()
     message( STATUS "CGAL_Qt3 needs OpenGL, cannot be configured.")
   endif()