recent developments integration

CMakeLists.txt

@@ -4,11 +4,20 @@ project(SCHNApps
 	LANGUAGES CXX
 )
 
+list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules")
+set(CGAL_DONT_OVERRIDE_CMAKE_FLAGS TRUE CACHE BOOL "preserve cmake flags" FORCE)
+
 #### Default build type
-if(NOT CMAKE_BUILD_TYPE)
+if(NOT CMAKE_BUILD_TYPE AND NOT MSVC)
 	set(CMAKE_BUILD_TYPE "Release")
 endif()
 
+#### Numerical precision
+option(SCHNAPPS_DOUBLE_PRECISION "Use double precision." ON)
+
+#### Aligned Vector3
+option(SCHNAPPS_ALIGNED_VEC3 "Use Eigen's AlignedVector3 by default." OFF)
+
 #### SCHNAPPS PATH / SCHNAPPS_SOURCE_DIR
 set(SCHNAPPS_PATH "${CMAKE_CURRENT_SOURCE_DIR}")
 set(SCHNAPPS_SOURCE_DIR ${SCHNAPPS_PATH})
@@ -26,4 +35,10 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/bin)
 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/lib)
 set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/lib)
 
+include(${CGOGN_PATH}/cmake/utilities.cmake)
+
+if(MSVC)
+	add_flags(CMAKE_CXX_FLAGS "/bigobj")
+endif()
+
 add_subdirectory(${SCHNAPPS_SOURCE_DIR}/schnapps)

cmake/Modules/CGAL_GeneratorSpecificSettings.cmake

@@ -0,0 +1,56 @@
+if ( NOT CGAL_GENERATOR_SPECIFIC_SETTINGS_FILE_INCLUDED )
+  set( CGAL_GENERATOR_SPECIFIC_SETTINGS_FILE_INCLUDED 1 )
+
+  message( STATUS "Targetting ${CMAKE_GENERATOR}")
+
+  if ( MSVC )
+    message( STATUS "Target build enviroment supports auto-linking" )
+    set(CGAL_AUTO_LINK_ENABLED TRUE)
+  endif()
+
+  if     ( MSVC15 )
+    set(CGAL_TOOLSET "vc150")
+    message( STATUS "Using VC15 compiler." )
+  elseif ( MSVC14 )
+    set(CGAL_TOOLSET "vc140")
+    message( STATUS "Using VC14 compiler." )
+  elseif ( MSVC12 )
+    set(CGAL_TOOLSET "vc120")
+    message( STATUS "Using VC12 compiler." )
+  elseif ( MSVC11 )
+    set(CGAL_TOOLSET "vc110")
+    message( STATUS "Using VC11 compiler." )
+  elseif ( MSVC10 )
+    set(CGAL_TOOLSET "vc100")
+    message( STATUS "Using VC10 compiler." )
+  elseif ( MSVC90 )
+    set(CGAL_TOOLSET "vc90")
+    message( STATUS "Using VC90 compiler." )
+  elseif ( MSVC80 )
+    set(CGAL_TOOLSET "vc80")
+    message( STATUS "Using VC80 compiler." )
+  elseif ( MSVC71 )
+    set(CGAL_TOOLSET "vc71")
+    message( STATUS "Using VC71 compiler." )
+  else()
+    message( STATUS "Using ${CMAKE_CXX_COMPILER} compiler." )
+  endif()
+
+
+  # From james Bigler, in the cmake users list.
+  IF (APPLE)
+    exec_program(uname ARGS -v  OUTPUT_VARIABLE DARWIN_VERSION)
+    string(REGEX MATCH "[0-9]+" DARWIN_VERSION ${DARWIN_VERSION})
+    message(STATUS "DARWIN_VERSION=${DARWIN_VERSION}")
+    if (DARWIN_VERSION GREATER 8)
+       message(STATUS "Mac Leopard detected")
+      set(CGAL_APPLE_LEOPARD 1)
+    endif()
+  endif()
+
+  if ( NOT "${CMAKE_CFG_INTDIR}" STREQUAL "." )
+    set(HAS_CFG_INTDIR TRUE CACHE INTERNAL "Generator uses intermediate configuration directory" )
+    message( STATUS "Generator uses intermediate configuration directory: ${CMAKE_CFG_INTDIR}" )
+  endif()
+
+endif()

cmake/Modules/FindCGAL.cmake

@@ -0,0 +1,89 @@
+#
+# The following module is based on FindVTK.cmake
+#
+
+# - Find a CGAL installation or binary tree.
+# The following variables are set if CGAL is found.  If CGAL is not
+# found, CGAL_FOUND is set to false.
+#
+#  CGAL_FOUND         - Set to true when CGAL is found.
+#  CGAL_USE_FILE      - CMake file to use CGAL.
+#
+
+# Construct consitent error messages for use below.
+set(CGAL_DIR_DESCRIPTION "directory containing CGALConfig.cmake. This is either the binary directory where CGAL was configured or PREFIX/lib/CGAL for an installation.")
+set(CGAL_DIR_MESSAGE     "CGAL not found.  Set the CGAL_DIR cmake variable or environment variable to the ${CGAL_DIR_DESCRIPTION}")
+
+if ( NOT CGAL_DIR )
+
+  # Get the system search path as a list.
+  if(UNIX)
+    string(REGEX MATCHALL "[^:]+" CGAL_DIR_SEARCH1 "$ENV{PATH}")
+  else()
+    string(REGEX REPLACE "\\\\" "/" CGAL_DIR_SEARCH1 "$ENV{PATH}")
+  endif()
+
+  string(REGEX REPLACE "/;" ";" CGAL_DIR_SEARCH2 "${CGAL_DIR_SEARCH1}")
+
+  # Construct a set of paths relative to the system search path.
+  set(CGAL_DIR_SEARCH "")
+
+  foreach(dir ${CGAL_DIR_SEARCH2})
+
+    set(CGAL_DIR_SEARCH ${CGAL_DIR_SEARCH} ${dir}/../lib/CGAL )
+
+  endforeach()
+
+
+  #
+  # Look for an installation or build tree.
+  #
+  find_path(CGAL_DIR CGALConfig.cmake
+
+    # Look for an environment variable CGAL_DIR.
+    $ENV{CGAL_DIR}
+
+    # Look in places relative to the system executable search path.
+    ${CGAL_DIR_SEARCH}
+
+    # Look in standard UNIX install locations.
+    /usr/local/lib/CGAL
+    /usr/lib/CGAL
+
+    # Read from the CMakeSetup registry entries.  It is likely that
+    # CGAL will have been recently built.
+    [HKEY_CURRENT_USER\\Software\\Kitware\\CMakeSetup\\Settings\\StartPath;WhereBuild1]
+    [HKEY_CURRENT_USER\\Software\\Kitware\\CMakeSetup\\Settings\\StartPath;WhereBuild2]
+    [HKEY_CURRENT_USER\\Software\\Kitware\\CMakeSetup\\Settings\\StartPath;WhereBuild3]
+    [HKEY_CURRENT_USER\\Software\\Kitware\\CMakeSetup\\Settings\\StartPath;WhereBuild4]
+    [HKEY_CURRENT_USER\\Software\\Kitware\\CMakeSetup\\Settings\\StartPath;WhereBuild5]
+    [HKEY_CURRENT_USER\\Software\\Kitware\\CMakeSetup\\Settings\\StartPath;WhereBuild6]
+    [HKEY_CURRENT_USER\\Software\\Kitware\\CMakeSetup\\Settings\\StartPath;WhereBuild7]
+    [HKEY_CURRENT_USER\\Software\\Kitware\\CMakeSetup\\Settings\\StartPath;WhereBuild8]
+    [HKEY_CURRENT_USER\\Software\\Kitware\\CMakeSetup\\Settings\\StartPath;WhereBuild9]
+    [HKEY_CURRENT_USER\\Software\\Kitware\\CMakeSetup\\Settings\\StartPath;WhereBuild10]
+
+    # Help the user find it if we cannot.
+    DOC "The ${CGAL_DIR_DESCRIPTION}"
+  )
+
+endif()
+
+if ( CGAL_DIR )
+
+  if ( EXISTS "${CGAL_DIR}/CGALConfig.cmake" )
+    include( "${CGAL_DIR}/CGALConfig.cmake" )
+    set( CGAL_FOUND TRUE )
+  endif()
+
+endif()
+
+if( NOT CGAL_FOUND)
+  if(CGAL_FIND_REQUIRED)
+    MESSAGE(FATAL_ERROR ${CGAL_DIR_MESSAGE})
+  else()
+    if(NOT CGAL_FIND_QUIETLY)
+      MESSAGE(STATUS ${CGAL_DIR_MESSAGE})
+    endif()
+  endif()
+endif()

cmake/Modules/FindGMP.cmake

@@ -0,0 +1,62 @@
+# - Try to find the GMP libraries
+# This module defines:
+#  GMP_FOUND             - system has GMP lib
+#  GMP_INCLUDE_DIR       - the GMP include directory
+#  GMP_LIBRARIES_DIR     - directory where the GMP libraries are located
+#  GMP_LIBRARIES         - Link these to use GMP
+#  GMP_IN_CGAL_AUXILIARY - TRUE if the GMP found is the one distributed with CGAL in the auxiliary folder
+
+# TODO: support MacOSX
+
+include(FindPackageHandleStandardArgs)
+include(CGAL_GeneratorSpecificSettings)
+
+if(GMP_INCLUDE_DIR)
+  set(GMP_in_cache TRUE)
+else()
+  set(GMP_in_cache FALSE)
+endif()
+if(NOT GMP_LIBRARIES)
+  set(GMP_in_cache FALSE)
+endif()
+
+# Is it already configured?
+if (GMP_in_cache)
+
+  set(GMP_FOUND TRUE)
+
+else()
+
+  find_path(GMP_INCLUDE_DIR
+            NAMES gmp.h
+            HINTS ENV GMP_INC_DIR
+                  ENV GMP_DIR
+                  ${CGAL_INSTALLATION_PACKAGE_DIR}/auxiliary/gmp/include
+            PATH_SUFFIXES include
+  	        DOC "The directory containing the GMP header files"
+           )
+
+  if ( GMP_INCLUDE_DIR STREQUAL "${CGAL_INSTALLATION_PACKAGE_DIR}/auxiliary/gmp/include" )
+    cache_set( GMP_IN_CGAL_AUXILIARY TRUE )
+  endif()
+
+  find_library(GMP_LIBRARIES NAMES gmp libgmp-10
+    HINTS ENV GMP_LIB_DIR
+          ENV GMP_DIR
+          ${CGAL_INSTALLATION_PACKAGE_DIR}/auxiliary/gmp/lib
+    PATH_SUFFIXES lib
+    DOC "Path to the GMP library"
+    )
+
+  if ( GMP_LIBRARIES )
+    get_filename_component(GMP_LIBRARIES_DIR ${GMP_LIBRARIES} PATH CACHE )
+  endif()
+
+  # Attempt to load a user-defined configuration for GMP if couldn't be found
+  if ( NOT GMP_INCLUDE_DIR OR NOT GMP_LIBRARIES_DIR )
+    include( GMPConfig OPTIONAL )
+  endif()
+
+  find_package_handle_standard_args(GMP "DEFAULT_MSG" GMP_LIBRARIES GMP_INCLUDE_DIR)
+
+endif()

cmake/Modules/FindMPFR.cmake

@@ -0,0 +1,62 @@
+# Try to find the MPFR libraries
+# MPFR_FOUND - system has MPFR lib
+# MPFR_INCLUDE_DIR - the MPFR include directory
+# MPFR_LIBRARIES_DIR - Directory where the MPFR libraries are located
+# MPFR_LIBRARIES - the MPFR libraries
+# MPFR_IN_CGAL_AUXILIARY - TRUE if the MPFR found is the one distributed with CGAL in the auxiliary folder
+
+# TODO: support MacOSX
+
+include(FindPackageHandleStandardArgs)
+include(CGAL_GeneratorSpecificSettings)
+
+if(MPFR_INCLUDE_DIR)
+  set(MPFR_in_cache TRUE)
+else()
+  set(MPFR_in_cache FALSE)
+endif()
+if(NOT MPFR_LIBRARIES)
+  set(MPFR_in_cache FALSE)
+endif()
+
+# Is it already configured?
+if (MPFR_in_cache)
+
+  set(MPFR_FOUND TRUE)
+
+else()
+
+  find_path(MPFR_INCLUDE_DIR
+            NAMES mpfr.h
+            HINTS ENV MPFR_INC_DIR
+                  ENV MPFR_DIR
+                  ${CGAL_INSTALLATION_PACKAGE_DIR}/auxiliary/gmp/include
+            PATH_SUFFIXES include
+  	        DOC "The directory containing the MPFR header files"
+           )
+
+  if ( MPFR_INCLUDE_DIR STREQUAL "${CGAL_INSTALLATION_PACKAGE_DIR}/auxiliary/gmp/include" )
+    cache_set( MPFR_IN_CGAL_AUXILIARY TRUE )
+  endif()
+
+  find_library(MPFR_LIBRARIES NAMES mpfr libmpfr-4 libmpfr-1
+    HINTS ENV MPFR_LIB_DIR
+          ENV MPFR_DIR
+          ${CGAL_INSTALLATION_PACKAGE_DIR}/auxiliary/gmp/lib
+    PATH_SUFFIXES lib
+    DOC "Path to the MPFR library"
+    )
+
+  if ( MPFR_LIBRARIES )
+    get_filename_component(MPFR_LIBRARIES_DIR ${MPFR_LIBRARIES} PATH CACHE )
+  endif()
+
+  # Attempt to load a user-defined configuration for MPFR if couldn't be found
+  if ( NOT MPFR_INCLUDE_DIR OR NOT MPFR_LIBRARIES_DIR )
+    include( MPFRConfig OPTIONAL )
+  endif()
+
+  find_package_handle_standard_args(MPFR "DEFAULT_MSG" MPFR_LIBRARIES MPFR_INCLUDE_DIR)
+
+endif()
+