diff --git a/.gitattributes b/.gitattributes index 7b316ef5753..443a223f47d 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1554,6 +1554,13 @@ CMake/cmake/modules/CheckCXXSourceRuns.cmake -text CMake/cmake/modules/CreateSingleSourceCGALProgram.cmake -text CMake/cmake/modules/CreateSingleSourceCGALQt3Program.cmake -text CMake/cmake/modules/CreateSingleSourceCGALQt4Program.cmake -text +CMake/cmake/modules/Extract_BOOST_version.cmake -text +CMake/cmake/modules/Extract_GMP_version.cmake -text +CMake/cmake/modules/Extract_MPFR_version.cmake -text +CMake/cmake/modules/Extract_OpenGL_version.cmake -text +CMake/cmake/modules/Extract_Qt3_version.cmake -text +CMake/cmake/modules/Extract_TAUCS_version.cmake -text +CMake/cmake/modules/Extract_ZLIB_version.cmake -text CMake/cmake/modules/FindBOOST_PROGRAM_OPTIONS.cmake -text CMake/cmake/modules/FindBOOST_THREAD.cmake -text CMake/cmake/modules/FindBoost2.cmake -text @@ -1569,7 +1576,6 @@ CMake/cmake/modules/FindQGLViewer.cmake -text CMake/cmake/modules/FindTAUCS.cmake -text CMake/cmake/modules/FindZLIB.cmake -text CMake/cmake/modules/GeneratorSpecificSettings.cmake -text -CMake/cmake/modules/LogCMakeVariables.cmake -text CMake/cmake/modules/MacroFindOptionalCGALDependency.cmake -text CMake/cmake/modules/MacroOptionalFindPackage.cmake -text CMake/cmake/modules/OptionalAddSubdirectory.cmake -text diff --git a/CMake/cmake/modules/CGAL_SetupFlags.cmake b/CMake/cmake/modules/CGAL_SetupFlags.cmake index eafb4f8945d..61da1462e27 100644 --- a/CMake/cmake/modules/CGAL_SetupFlags.cmake +++ b/CMake/cmake/modules/CGAL_SetupFlags.cmake @@ -2,8 +2,8 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CGAL_CXX_FLAGS}") if ( CGAL_RELEASE ) set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} ${CGAL_CXX_FLAGS_RELEASE}") - message( STATUS "USING CUSTOM_CXXFLAGS ${CGAL_CXX_FLAGS} ${CGAL_CXX_FLAGS_RELEASE}" ) - message( STATUS "USING CXXFLAGS ${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_RELEASE}" ) + message( STATUS "USING CUSTOM_CXXFLAGS = '${CGAL_CXX_FLAGS} ${CGAL_CXX_FLAGS_RELEASE}'" ) + message( STATUS "USING CXXFLAGS = '${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_RELEASE}'" ) if ( NOT CMAKE_BUILD_TYPE ) set ( CMAKE_BUILD_TYPE Release ) endif() @@ -11,8 +11,8 @@ endif() if ( CGAL_DEBUG ) set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} ${CGAL_CXX_FLAGS_DEBUG}") - message( STATUS "USING CUSTOM_CXXFLAGS ${CGAL_CXX_FLAGS} ${CGAL_CXX_FLAGS_DEBUG}" ) - message( STATUS "USING CXXFLAGS ${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_DEBUG}" ) + message( STATUS "USING CUSTOM_CXXFLAGS = '${CGAL_CXX_FLAGS} ${CGAL_CXX_FLAGS_DEBUG}'" ) + message( STATUS "USING CXXFLAGS = '${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_DEBUG}'" ) if ( NOT CMAKE_BUILD_TYPE ) set ( CMAKE_BUILD_TYPE Debug ) endif() @@ -25,14 +25,14 @@ if ( BUILD_SHARED_LIBS ) if ( CGAL_RELEASE ) set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} ${CGAL_SHARED_LINKER_FLAGS_RELEASE}") - message( STATUS "USING CUSTOM_LDFLAGS ${CGAL_SHARED_LINKER_FLAGS} ${CGAL_SHARED_LINKER_FLAGS_RELEASE}" ) - message( STATUS "USING LDFLAGS ${CMAKE_SHARED_LINKER_FLAGS} ${CMAKE_SHARED_LINKER_FLAGS_RELEASE}" ) + message( STATUS "USING CUSTOM_LDFLAGS = '${CGAL_SHARED_LINKER_FLAGS} ${CGAL_SHARED_LINKER_FLAGS_RELEASE}'" ) + message( STATUS "USING LDFLAGS = ' ${CMAKE_SHARED_LINKER_FLAGS} ${CMAKE_SHARED_LINKER_FLAGS_RELEASE}'" ) endif() if ( CGAL_DEBUG ) set(CMAKE_SHARED_LINKER_FLAGS_DEBUG "${CMAKE_SHARED_LINKER_FLAGS_DEBUG} ${CGAL_SHARED_LINKER_FLAGS_DEBUG}") - message( STATUS "USING CUSTOM_LDFLAGS ${CGAL_SHARED_LINKER_FLAGS} ${CGAL_SHARED_LINKER_FLAGS_DEBUG}" ) - message( STATUS "USING LDFLAGS ${CMAKE_SHARED_LINKER_FLAGS} ${CMAKE_SHARED_LINKER_FLAGS_DEBUG}" ) + message( STATUS "USING CUSTOM_LDFLAGS = '${CGAL_SHARED_LINKER_FLAGS} ${CGAL_SHARED_LINKER_FLAGS_DEBUG}'" ) + message( STATUS "USING LDFLAGS = '${CMAKE_SHARED_LINKER_FLAGS} ${CMAKE_SHARED_LINKER_FLAGS_DEBUG}'" ) endif() else() @@ -41,14 +41,14 @@ else() if ( CGAL_RELEASE ) set(CMAKE_MODULE_LINKER_FLAGS_RELEASE "${CMAKE_MODULE_LINKER_FLAGS_RELEASE} ${CGAL_MODULE_LINKER_FLAGS_RELEASE}") - message( STATUS "USING CUSTOM_LDFLAGS ${CGAL_STATIC_LINKER_FLAGS} ${CGAL_STATIC_LINKER_FLAGS_RELEASE}" ) - message( STATUS "USING LDFLAGS ${CMAKE_STATIC_LINKER_FLAGS} ${CMAKE_STATIC_LINKER_FLAGS_RELEASE}" ) + message( STATUS "USING CUSTOM_LDFLAGS = '${CGAL_STATIC_LINKER_FLAGS} ${CGAL_STATIC_LINKER_FLAGS_RELEASE}'" ) + message( STATUS "USING LDFLAGS = '${CMAKE_STATIC_LINKER_FLAGS} ${CMAKE_STATIC_LINKER_FLAGS_RELEASE}'" ) endif() if ( CGAL_DEBUG ) set(CMAKE_MODULE_LINKER_FLAGS_DEBUG "${CMAKE_MODULE_LINKER_FLAGS_DEBUG} ${CGAL_MODULE_LINKER_FLAGS_DEBUG}") - message( STATUS "USING CUSTOM_LDFLAGS ${CGAL_STATIC_LINKER_FLAGS} ${CGAL_STATIC_LINKER_FLAGS_DEBUG}" ) - message( STATUS "USING LDFLAGS ${CMAKE_STATIC_LINKER_FLAGS} ${CMAKE_STATIC_LINKER_FLAGS_DEBUG}" ) + message( STATUS "USING CUSTOM_LDFLAGS = '${CGAL_STATIC_LINKER_FLAGS} ${CGAL_STATIC_LINKER_FLAGS_DEBUG}'" ) + message( STATUS "USING LDFLAGS = '${CMAKE_STATIC_LINKER_FLAGS} ${CMAKE_STATIC_LINKER_FLAGS_DEBUG}'" ) endif() endif() @@ -57,12 +57,12 @@ set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${CGAL_EXE_LINKER_FLAGS}") if ( CGAL_RELEASE ) set(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} ${CGAL_EXE_LINKER_FLAGS_RELEASE}") - message( STATUS "USING CUSTOM_EXEFLAGS ${CGAL_EXE_LINKER_FLAGS} ${CGAL_EXE_LINKER_FLAGS_RELEASE}" ) - message( STATUS "USING EXEFLAGS ${CMAKE_EXE_LINKER_FLAGS} ${CMAKE_EXE_LINKER_FLAGS_RELEASE}" ) + message( STATUS "USING CUSTOM_EXEFLAGS = '${CGAL_EXE_LINKER_FLAGS} ${CGAL_EXE_LINKER_FLAGS_RELEASE}'" ) + message( STATUS "USING EXEFLAGS = '${CMAKE_EXE_LINKER_FLAGS} ${CMAKE_EXE_LINKER_FLAGS_RELEASE}'" ) endif() if ( CGAL_DEBUG ) set(CMAKE_EXE_LINKER_FLAGS_DEBUG "${CMAKE_EXE_LINKER_FLAGS_DEBUG} ${CGAL_EXE_LINKER_FLAGS_DEBUG}") - message( STATUS "USING CUSTOM_EXEFLAGS ${CGAL_EXE_LINKER_FLAGS} ${CGAL_EXE_LINKER_FLAGS_DEBUG}" ) - message( STATUS "USING EXEFLAGS ${CMAKE_EXE_LINKER_FLAGS} ${CMAKE_EXE_LINKER_FLAGS_DEBUG}" ) + message( STATUS "USING CUSTOM_EXEFLAGS = '${CGAL_EXE_LINKER_FLAGS} ${CGAL_EXE_LINKER_FLAGS_DEBUG}'" ) + message( STATUS "USING EXEFLAGS = '${CMAKE_EXE_LINKER_FLAGS} ${CMAKE_EXE_LINKER_FLAGS_DEBUG}'" ) endif() diff --git a/CMake/cmake/modules/Extract_BOOST_version.cmake b/CMake/cmake/modules/Extract_BOOST_version.cmake new file mode 100644 index 00000000000..b1c0c78568e --- /dev/null +++ b/CMake/cmake/modules/Extract_BOOST_version.cmake @@ -0,0 +1,26 @@ +include(ReadLines) +include(FindMatchingItem) + +if ( Boost_FOUND ) + + readlines(${Boost_INCLUDE_DIRS}/boost/version.hpp BOOST_VERSION_FILE) + + find_matching_item(BOOST_VERSION_FILE "BOOST_LIB_VERSION" BOOST_LIB_VERSION_LINE ) + + string( REGEX MATCH "\".*\"$" BOOST_LIB_VERSION_STR2 ${BOOST_LIB_VERSION_LINE} ) + string( REPLACE "\"" "" BOOST_LIB_VERSION_STR1 ${BOOST_LIB_VERSION_STR2} ) + string( REPLACE "_" "." BOOST_VERSION ${BOOST_LIB_VERSION_STR1} ) + + + message( STATUS "USING BOOST_VERSION = '${BOOST_VERSION}'" ) + + +endif() + +if ( BOOST_THREAD_FOUND ) + + set ( BOOST_THREAD_VERSION ${BOOST_VERSION} ) + + message( STATUS "USING BOOST_THREAD_VERSION = '${BOOST_THREAD_VERSION}'" ) + +endif() diff --git a/CMake/cmake/modules/Extract_GMP_version.cmake b/CMake/cmake/modules/Extract_GMP_version.cmake new file mode 100644 index 00000000000..4307ba9c4f5 --- /dev/null +++ b/CMake/cmake/modules/Extract_GMP_version.cmake @@ -0,0 +1,32 @@ +include(ReadLines) +include(FindMatchingItem) + +if ( GMP_FOUND ) + + readlines(${GMP_INCLUDE_DIR}/gmp.h GMP_H_FILE) + + find_matching_item(GMP_H_FILE "__GNU_MP_VERSION " __GNU_MP_VERSION_LINE ) + find_matching_item(GMP_H_FILE "__GNU_MP_VERSION_MINOR " __GNU_MP_VERSION_MINOR_LINE ) + find_matching_item(GMP_H_FILE "__GNU_MP_VERSION_PATCHLEVEL " __GNU_MP_VERSION_PATCHLEVEL_LINE ) + + string( REPLACE " " ";" __GNU_MP_VERSION_LINE_LIST ${__GNU_MP_VERSION_LINE} ) + string( REPLACE " " ";" __GNU_MP_VERSION_MINOR_LINE_LIST ${__GNU_MP_VERSION_MINOR_LINE} ) + string( REPLACE " " ";" __GNU_MP_VERSION_PATCHLEVEL_LINE_LIST ${__GNU_MP_VERSION_PATCHLEVEL_LINE} ) + + list( GET __GNU_MP_VERSION_LINE_LIST 2 __GNU_MP_VERSION ) + list( GET __GNU_MP_VERSION_MINOR_LINE_LIST 2 __GNU_MP_VERSION_MINOR ) + list( GET __GNU_MP_VERSION_PATCHLEVEL_LINE_LIST 2 __GNU_MP_VERSION_PATCHLEVEL ) + + set( GMP_VERSION "${__GNU_MP_VERSION}.${__GNU_MP_VERSION_MINOR}.${__GNU_MP_VERSION_PATCHLEVEL}" ) + + message( STATUS "USING GMP_VERSION = '${GMP_VERSION}'" ) + +endif() + +if ( GMPXX_FOUND AND GMP_VERSION ) + + set( GMPXX_VERSION ${GMP_VERSION} ) + + message( STATUS "USING GMPXX_VERSION = '${GMPXX_VERSION}'" ) + +endif() diff --git a/CMake/cmake/modules/Extract_MPFR_version.cmake b/CMake/cmake/modules/Extract_MPFR_version.cmake new file mode 100644 index 00000000000..f16d4eafae2 --- /dev/null +++ b/CMake/cmake/modules/Extract_MPFR_version.cmake @@ -0,0 +1,19 @@ +include(ReadLines) +include(FindMatchingItem) + +if ( MPFR_FOUND ) + + readlines(${MPFR_INCLUDE_DIR}/mpfr.h MPFR_H_FILE) + + find_matching_item(MPFR_H_FILE "MPFR_VERSION_STRING" MPFR_VERSION_STRING_LINE ) + + string( REPLACE " " ";" MPFR_VERSION_STRING_LINE_LIST ${MPFR_VERSION_STRING_LINE} ) + + list( GET MPFR_VERSION_STRING_LINE_LIST 2 MPFR_VERSION_STR ) + + string( REPLACE "\"" "" MPFR_VERSION ${MPFR_VERSION_STR} ) + + message( STATUS "USING MPFR_VERSION = '${MPFR_VERSION}'" ) + +endif() + diff --git a/CMake/cmake/modules/Extract_OpenGL_version.cmake b/CMake/cmake/modules/Extract_OpenGL_version.cmake new file mode 100644 index 00000000000..82014900368 --- /dev/null +++ b/CMake/cmake/modules/Extract_OpenGL_version.cmake @@ -0,0 +1,58 @@ +include(ReadLines) +include(FindMatchingItem) + +if ( OPENGL_FOUND ) + + readlines(${OPENGL_INCLUDE_DIR}/GL/gl.h OPENGL_VERSION_FILE) + + find_matching_item(OPENGL_VERSION_FILE "GL_VERSION_2_2" OPENGL_VERSION_LINE ) + if ( OPENGL_VERSION_LINE ) + set( OPENGL_VERSION "2.2" ) + else() + find_matching_item(OPENGL_VERSION_FILE "GL_VERSION_2_1" OPENGL_VERSION_LINE ) + if ( OPENGL_VERSION_LINE ) + set( OPENGL_VERSION "2.1" ) + else() + find_matching_item(OPENGL_VERSION_FILE "GL_VERSION_2_0" OPENGL_VERSION_LINE ) + if ( OPENGL_VERSION_LINE ) + set( OPENGL_VERSION "2.0" ) + else() + find_matching_item(OPENGL_VERSION_FILE "GL_VERSION_1_5" OPENGL_VERSION_LINE ) + if ( OPENGL_VERSION_LINE ) + set( OPENGL_VERSION "1.5" ) + else() + find_matching_item(OPENGL_VERSION_FILE "GL_VERSION_1_4" OPENGL_VERSION_LINE ) + if ( OPENGL_VERSION_LINE ) + set( OPENGL_VERSION "1.4" ) + else() + find_matching_item(OPENGL_VERSION_FILE "GL_VERSION_1_3" OPENGL_VERSION_LINE ) + if ( OPENGL_VERSION_LINE ) + set( OPENGL_VERSION "1.4" ) + else() + find_matching_item(OPENGL_VERSION_FILE "GL_VERSION_1_2" OPENGL_VERSION_LINE ) + if ( OPENGL_VERSION_LINE ) + set( OPENGL_VERSION "1.4" ) + else() + find_matching_item(OPENGL_VERSION_FILE "GL_VERSION_1_1" OPENGL_VERSION_LINE ) + if ( OPENGL_VERSION_LINE ) + set( OPENGL_VERSION "1.4" ) + else() + find_matching_item(OPENGL_VERSION_FILE "GL_VERSION_1_0" OPENGL_VERSION_LINE ) + if ( OPENGL_VERSION_LINE ) + set( OPENGL_VERSION "1.0" ) + else() + set( OPENGL_VERSION "unknown" ) + endif() + endif() + endif() + endif() + endif() + endif() + endif() + endif() + endif() + + message( STATUS "USING OPENGL_VERSION = '${OPENGL_VERSION}'" ) + +endif() + diff --git a/CMake/cmake/modules/Extract_Qt3_version.cmake b/CMake/cmake/modules/Extract_Qt3_version.cmake new file mode 100644 index 00000000000..ece80ac418b --- /dev/null +++ b/CMake/cmake/modules/Extract_Qt3_version.cmake @@ -0,0 +1,11 @@ +include(ReadLines) +include(FindMatchingItem) + +if ( QT_FOUND ) + + set( QT_VERSION ${qt_version_str} ) + + message( STATUS "USING QT_VERSION = '${QT_VERSION}'" ) + +endif() + diff --git a/CMake/cmake/modules/Extract_TAUCS_version.cmake b/CMake/cmake/modules/Extract_TAUCS_version.cmake new file mode 100644 index 00000000000..902d6b36f36 --- /dev/null +++ b/CMake/cmake/modules/Extract_TAUCS_version.cmake @@ -0,0 +1,13 @@ +include(ReadLines) +include(FindMatchingItem) + +if ( TAUCS_FOUND ) + + # TAUCS provides no version number :-( + #/ Version 1 is obsolete, thus we assume version 2 (latest is 2.2 on 03/2006) + set( TAUCS_VERSION "2.x" ) + + message( STATUS "USING TAUCS_VERSION = '${TAUCS_VERSION}'" ) + +endif() + diff --git a/CMake/cmake/modules/Extract_ZLIB_version.cmake b/CMake/cmake/modules/Extract_ZLIB_version.cmake new file mode 100644 index 00000000000..173fc9e13f5 --- /dev/null +++ b/CMake/cmake/modules/Extract_ZLIB_version.cmake @@ -0,0 +1,19 @@ +include(ReadLines) +include(FindMatchingItem) + +if ( ZLIB_FOUND ) + + readlines(${ZLIB_INCLUDE_DIR}/zlib.h ZLIB_H_FILE) + + find_matching_item(ZLIB_H_FILE "define ZLIB_VERSION" ZLIB_VERSION_LINE ) + + string( REPLACE " " ";" ZLIB_VERSION_LINE_LIST ${ZLIB_VERSION_LINE} ) + + list( GET ZLIB_VERSION_LINE_LIST 2 ZLIB_VERSION_STR ) + + string( REPLACE "\"" "" ZLIB_VERSION ${ZLIB_VERSION_STR} ) + + message( STATUS "USING ZLIB_VERSION = '${ZLIB_VERSION}'" ) + +endif() + diff --git a/CMake/cmake/modules/FindBOOST_PROGRAM_OPTIONS.cmake b/CMake/cmake/modules/FindBOOST_PROGRAM_OPTIONS.cmake index d1ca732846b..ae30c762da4 100644 --- a/CMake/cmake/modules/FindBOOST_PROGRAM_OPTIONS.cmake +++ b/CMake/cmake/modules/FindBOOST_PROGRAM_OPTIONS.cmake @@ -23,9 +23,5 @@ if(Boost_FOUND AND Boost_LIBRARY_DIRS) find_package_handle_standard_args(BOOST_PROGRAM_OPTIONS "boost_program_options not found." BOOST_PROGRAM_OPTIONS_LIBRARIES ) - if ( BOOST_PROGRAM_OPTIONS_FOUND ) - message( STATUS "USING BOOST_PROGRAM_OPTIONS_VERSION ${BOOST_LIB_VERSION_STR}" ) - endif() - endif() diff --git a/CMake/cmake/modules/FindBOOST_THREAD.cmake b/CMake/cmake/modules/FindBOOST_THREAD.cmake index 0ff6bf08b0c..110fc8daf7b 100644 --- a/CMake/cmake/modules/FindBOOST_THREAD.cmake +++ b/CMake/cmake/modules/FindBOOST_THREAD.cmake @@ -24,9 +24,5 @@ if(Boost_FOUND AND Boost_LIBRARY_DIRS) find_package_handle_standard_args(BOOST_THREAD "boost_thread not found." BOOST_THREAD_LIBRARIES ) - if ( BOOST_THREAD_FOUND ) - message( STATUS "USING BOOST_THREAD_VERSION ${BOOST_LIB_VERSION_STR}" ) - endif() - endif() diff --git a/CMake/cmake/modules/FindBoost2.cmake b/CMake/cmake/modules/FindBoost2.cmake index 07a715c8129..bfdebe981e7 100644 --- a/CMake/cmake/modules/FindBoost2.cmake +++ b/CMake/cmake/modules/FindBoost2.cmake @@ -51,8 +51,6 @@ # to use Link Directories. include(FindPackageHandleStandardArgs) -include(ReadLines) -include(FindMatchingItem) set(BOOST_INCLUDE_PATH_DESCRIPTION "directory containing the boost include files. E.g /usr/local/include/boost_1_34_1 or c:\\Program Files\\boost\\boost_1_34_1") @@ -131,16 +129,6 @@ if(Boost_INCLUDE_DIRS) set(Boost_LIBRARY_DIRS ${Boost_LIBRARY_DIR} CACHE PATH "The ${BOOST_LIB_PATH_DESCRIPTION}" ) endif() - readlines(${Boost_INCLUDE_DIRS}/boost/version.hpp BOOST_VERSION_FILE) - - find_matching_item(BOOST_VERSION_FILE "BOOST_LIB_VERSION" BOOST_LIB_VERSION_LINE ) - - string( REGEX MATCH "\".*\"$" BOOST_LIB_VERSION_STR2 ${BOOST_LIB_VERSION_LINE} ) - string( REPLACE "\"" "" BOOST_LIB_VERSION_STR1 ${BOOST_LIB_VERSION_STR2} ) - string( REPLACE "_" "." BOOST_LIB_VERSION_STR ${BOOST_LIB_VERSION_STR1} ) - message( STATUS "USING BOOST_VERSION ${BOOST_LIB_VERSION_STR}" ) - - endif() find_package_handle_standard_args(Boost "Boost was not found. ${BOOST_DIR_MESSAGE}" Boost_INCLUDE_DIRS ) diff --git a/CMake/cmake/modules/FindCGALDependencies.cmake b/CMake/cmake/modules/FindCGALDependencies.cmake index 86e04946199..f1ccd422d28 100644 --- a/CMake/cmake/modules/FindCGALDependencies.cmake +++ b/CMake/cmake/modules/FindCGALDependencies.cmake @@ -44,4 +44,13 @@ if(WITH_CGAL_CORE AND CGAL_CORE_FOUND ) set(CGAL_USE_CGAL_CORE 1) endif() +find_package(Qt3) + +include(Extract_BOOST_version) +include(Extract_OpenGL_version) +include(Extract_GMP_version) +include(Extract_MPFR_version) +include(Extract_ZLIB_version) +include(Extract_TAUCS_version) +include(Extract_Qt3_version) diff --git a/CMake/cmake/modules/FindGMP.cmake b/CMake/cmake/modules/FindGMP.cmake index fa5b541d6f8..15381b9fc2f 100644 --- a/CMake/cmake/modules/FindGMP.cmake +++ b/CMake/cmake/modules/FindGMP.cmake @@ -9,8 +9,6 @@ include(FindPackageHandleStandardArgs) include(GeneratorSpecificSettings) -include(ReadLines) -include(FindMatchingItem) # Is it already configured? if (GMP_INCLUDE_DIR AND GMP_LIBRARIES_DIR ) @@ -60,28 +58,6 @@ else() find_package_handle_standard_args(GMP "DEFAULT_MSG" GMP_INCLUDE_DIR GMP_LIBRARIES_DIR) - if ( GMP_FOUND ) - - readlines(${GMP_INCLUDE_DIR}/gmp.h GMP_H_FILE) - - find_matching_item(GMP_H_FILE "__GNU_MP_VERSION " __GNU_MP_VERSION_LINE ) - find_matching_item(GMP_H_FILE "__GNU_MP_VERSION_MINOR " __GNU_MP_VERSION_MINOR_LINE ) - find_matching_item(GMP_H_FILE "__GNU_MP_VERSION_PATCHLEVEL " __GNU_MP_VERSION_PATCHLEVEL_LINE ) - - string( REPLACE " " ";" __GNU_MP_VERSION_LINE_LIST ${__GNU_MP_VERSION_LINE} ) - string( REPLACE " " ";" __GNU_MP_VERSION_MINOR_LINE_LIST ${__GNU_MP_VERSION_MINOR_LINE} ) - string( REPLACE " " ";" __GNU_MP_VERSION_PATCHLEVEL_LINE_LIST ${__GNU_MP_VERSION_PATCHLEVEL_LINE} ) - - list( GET __GNU_MP_VERSION_LINE_LIST 2 __GNU_MP_VERSION ) - list( GET __GNU_MP_VERSION_MINOR_LINE_LIST 2 __GNU_MP_VERSION_MINOR ) - list( GET __GNU_MP_VERSION_PATCHLEVEL_LINE_LIST 2 __GNU_MP_VERSION_PATCHLEVEL ) - - set( GMP_VERSION "${__GNU_MP_VERSION}.${__GNU_MP_VERSION_MINOR}.${__GNU_MP_VERSION_PATCHLEVEL}" ) - - message( STATUS "USING GMP_VERSION ${GMP_VERSION}" ) - - endif() - endif() #mark_as_advanced(GMP_INCLUDE_DIR) diff --git a/CMake/cmake/modules/FindMPFR.cmake b/CMake/cmake/modules/FindMPFR.cmake index 19eb030a555..e81a47afb1a 100644 --- a/CMake/cmake/modules/FindMPFR.cmake +++ b/CMake/cmake/modules/FindMPFR.cmake @@ -9,8 +9,6 @@ include(FindPackageHandleStandardArgs) include(GeneratorSpecificSettings) -include(ReadLines) -include(FindMatchingItem) # Is it already configured? if (MPFR_INCLUDE_DIR AND MPFR_LIBRARIES_DIR ) @@ -60,24 +58,6 @@ else() find_package_handle_standard_args(MPFR "DEFAULT_MSG" MPFR_INCLUDE_DIR MPFR_LIBRARIES_DIR) - if ( MPFR_FOUND ) - - readlines(${MPFR_INCLUDE_DIR}/mpfr.h MPFR_H_FILE) - - find_matching_item(MPFR_H_FILE "MPFR_VERSION_STRING" MPFR_VERSION_STRING_LINE ) - - string( REPLACE " " ";" MPFR_VERSION_STRING_LINE_LIST ${MPFR_VERSION_STRING_LINE} ) - - list( GET MPFR_VERSION_STRING_LINE_LIST 2 MPFR_VERSION_STR ) - - string( REPLACE "\"" "" MPFR_VERSION ${MPFR_VERSION_STR} ) - - message( STATUS "USING MPFR_VERSION ${MPFR_VERSION}" ) - - endif() - -#define MPFR_VERSION_STRING "2.2.0" - endif() #mark_as_advanced(MPFR_INCLUDE_DIR) diff --git a/CMake/cmake/modules/LogCMakeVariables.cmake b/CMake/cmake/modules/LogCMakeVariables.cmake deleted file mode 100644 index 0661877e3fd..00000000000 --- a/CMake/cmake/modules/LogCMakeVariables.cmake +++ /dev/null @@ -1,261 +0,0 @@ -# Generic and CGAL-specific CMake variable logging -# (see http://www.cmake.org/Wiki/CMake_Useful_Variables/Logging_Useful_Variables) - - -# Utility macro: log a (text) variable -MACRO(LOG_VARIABLE VAR_NAME) - MESSAGE(STATUS "${VAR_NAME}: " ${${VAR_NAME}}) -ENDMACRO(LOG_VARIABLE) - - -# Utility macro: log a list -MACRO(LOG_LIST LIST_NAME SEPARATOR) - SET(_expanded_LIST) - FOREACH(_current ${${LIST_NAME}}) - SET(_expanded_LIST "${_expanded_LIST} ${SEPARATOR}${_current}") - ENDFOREACH(_current ${${LIST_NAME}}) - MESSAGE(STATUS "${LIST_NAME}: " ${_expanded_LIST}) -ENDMACRO(LOG_LIST) - - -# Log all generic and CGAL-specific CMake variable logging -MACRO (LOG_CMAKE_VARIABLES COMMENT) - - MESSAGE(STATUS "--------------- Start CMake Variable Logging (${COMMENT}) ---------------") - - # this is the file name and line number of the file where this variable is used. - LOG_VARIABLE(CMAKE_CURRENT_LIST_FILE) - LOG_VARIABLE(CMAKE_CURRENT_LIST_LINE) - - - # if you are building in-source, this is the same as CMAKE_SOURCE_DIR, otherwise - # this is the top level directory of your build tree - MESSAGE(STATUS "CMAKE_BINARY_DIR: " ${CMAKE_BINARY_DIR}) - MESSAGE(STATUS "CGAL_BINARY_DIR: " ${CGAL_BINARY_DIR}) - - # if you are building in-source, this is the same as CMAKE_CURRENT_SOURCE_DIR, otherwise this - # is the directory where the compiled or generated files from the current CMakeLists.txt will go to - MESSAGE(STATUS "CMAKE_CURRENT_BINARY_DIR: " ${CMAKE_CURRENT_BINARY_DIR}) - - # this is the directory, from which cmake was started, i.e. the top level source directory - MESSAGE(STATUS "CMAKE_SOURCE_DIR: " ${CMAKE_SOURCE_DIR}) - MESSAGE(STATUS "CGAL_SOURCE_DIR: " ${CGAL_SOURCE_DIR}) - - # this is the directory where the currently processed CMakeLists.txt is located in - MESSAGE(STATUS "CMAKE_CURRENT_SOURCE_DIR: " ${CMAKE_CURRENT_SOURCE_DIR}) - - # contains the full path to the top level directory of your build tree - MESSAGE(STATUS "PROJECT_BINARY_DIR: " ${PROJECT_BINARY_DIR}) - - # contains the full path to the root of your project source directory, - # i.e. to the nearest directory where CMakeLists.txt contains the PROJECT() command - MESSAGE(STATUS "PROJECT_SOURCE_DIR: " ${PROJECT_SOURCE_DIR}) - - # set this variable to specify a common place where CMake should put all executable files - # (instead of CMAKE_CURRENT_BINARY_DIR) - MESSAGE(STATUS "EXECUTABLE_OUTPUT_PATH: " ${EXECUTABLE_OUTPUT_PATH}) - - # set this variable to specify a common place where CMake should put all libraries - # (instead of CMAKE_CURRENT_BINARY_DIR) - MESSAGE(STATUS "LIBRARY_OUTPUT_PATH: " ${LIBRARY_OUTPUT_PATH}) - - # tell CMake to search first in directories listed in CMAKE_MODULE_PATH - # when you use FIND_PACKAGE() or INCLUDE() - LOG_LIST(CMAKE_MODULE_PATH " ") - - - # Configure install locations. - MESSAGE(STATUS "CMAKE_INSTALL_PREFIX " ${CMAKE_INSTALL_PREFIX}) - MESSAGE(STATUS "CGAL_INSTALL_DIR " ${CGAL_INSTALL_DIR}) - MESSAGE(STATUS "CGAL_LIB_INSTALL_DIR " ${CGAL_LIB_INSTALL_DIR}) - MESSAGE(STATUS "CGAL_INCLUDE_INSTALL_DIR " ${CGAL_INCLUDE_INSTALL_DIR}) - MESSAGE(STATUS "CGAL_BIN_INSTALL_DIR " ${CGAL_BIN_INSTALL_DIR}) - MESSAGE(STATUS "CGAL_AUXILIARY_INSTALL_DIR" ${CGAL_AUXILIARY_INSTALL_DIR}) - MESSAGE(STATUS "CGAL_MODULE_INSTALL_DIR " ${CGAL_MODULE_INSTALL_DIR}) - - - # this is the complete path of the cmake which runs currently (e.g. /usr/local/bin/cmake) - LOG_VARIABLE(CMAKE_COMMAND) - - # this is CMake's installation directory - LOG_VARIABLE(CMAKE_ROOT) - - # this is used when searching for include files e.g. using the FIND_PATH() command. - LOG_VARIABLE(CMAKE_INCLUDE_PATH) - - # this is used when searching for libraries e.g. using the FIND_LIBRARY() command. - LOG_VARIABLE(CMAKE_LIBRARY_PATH) - - # the complete system name, e.g. "Linux-2.4.22", "FreeBSD-5.4-RELEASE" or "Windows 5.1" - LOG_VARIABLE(CMAKE_SYSTEM) - - # the short system name, e.g. "Linux", "FreeBSD" or "Windows" - LOG_VARIABLE(CMAKE_SYSTEM_NAME) - - # only the version part of CMAKE_SYSTEM - LOG_VARIABLE(CMAKE_SYSTEM_VERSION) - - # the processor name (e.g. "Intel(R) Pentium(R) M processor 2.00GHz") - LOG_VARIABLE(CMAKE_SYSTEM_PROCESSOR) - - # is TRUE on all UNIX-like OS's, including Apple OS X and CygWin - LOG_VARIABLE(UNIX) - - # is TRUE on Windows, including CygWin - LOG_VARIABLE(WIN32) - - # is TRUE on Apple OS X - LOG_VARIABLE(APPLE) - - # is TRUE when using the MinGW compiler in Windows - LOG_VARIABLE(MINGW) - - # is TRUE on Windows when using the CygWin version of cmake - LOG_VARIABLE(CYGWIN) - - # is TRUE on Windows when using a Borland compiler - LOG_VARIABLE(BORLAND) - - # Microsoft compiler - LOG_VARIABLE(MSVC) - LOG_VARIABLE(MSVC_IDE) - LOG_VARIABLE(MSVC60) - LOG_VARIABLE(MSVC70) - LOG_VARIABLE(MSVC71) - LOG_VARIABLE(MSVC80) - LOG_VARIABLE(CMAKE_COMPILER_2005) - - - # set this to true if you don't want to rebuild the object files if the rules have changed, - # but not the actual source files or headers (e.g. if you changed the some compiler switches) - LOG_VARIABLE(CMAKE_SKIP_RULE_DEPENDENCY) - - # since CMake 2.1 the install rule depends on all, i.e. everything will be built before installing. - # If you don't like this, set this one to true. - LOG_VARIABLE(CMAKE_SKIP_INSTALL_ALL_DEPENDENCY) - - # If set, runtime paths are not added when using shared libraries. Default it is set to OFF - LOG_VARIABLE(CMAKE_SKIP_RPATH) - - # set this to true if you are using makefiles and want to see the full compile and link - # commands instead of only the shortened ones - LOG_VARIABLE(CMAKE_VERBOSE_MAKEFILE) - - # this will cause CMake to not put in the rules that re-run CMake. This might be useful if - # you want to use the generated build files on another machine. - LOG_VARIABLE(CMAKE_SUPPRESS_REGENERATION) - - - # A simple way to get switches to the compiler is to use ADD_DEFINITIONS(). - # But there are also two variables exactly for this purpose: - - # the compiler flags for compiling C sources -# LOG_VARIABLE(CMAKE_C_FLAGS) - - # the compiler flags for compiling C++ sources - LOG_VARIABLE(CMAKE_CXX_FLAGS) - - # Include directories - GET_DIRECTORY_PROPERTY(INCLUDE_DIRECTORIES INCLUDE_DIRECTORIES) - LOG_LIST(INCLUDE_DIRECTORIES "-I") - - # Choose the type of build. Example: SET(CMAKE_BUILD_TYPE Debug) - LOG_VARIABLE(CMAKE_BUILD_TYPE) - - # if this is set to ON, then all libraries are built as shared libraries by default. - LOG_VARIABLE(BUILD_SHARED_LIBS) - - # the compiler used for C files -# LOG_VARIABLE(CMAKE_C_COMPILER) - - # the compiler used for C++ files - LOG_VARIABLE(CMAKE_CXX_COMPILER) - - # if the compiler is a variant of gcc, this should be set to 1 -# LOG_VARIABLE(CMAKE_COMPILER_IS_GNUCC) - - # if the compiler is a variant of g++, this should be set to 1 - LOG_VARIABLE(CMAKE_COMPILER_IS_GNUCXX) - - # the tools for creating libraries - LOG_VARIABLE(CMAKE_AR) - LOG_VARIABLE(CMAKE_RANLIB) - -# # Rules for C++ sources: -# LOG_VARIABLE(CMAKE_CXX_CREATE_SHARED_LIBRARY) -# LOG_VARIABLE(CMAKE_CXX_CREATE_SHARED_MODULE) -# LOG_VARIABLE(CMAKE_CXX_CREATE_STATIC_LIBRARY) -# LOG_VARIABLE(CMAKE_CXX_COMPILE_OBJECT) -# LOG_VARIABLE(CMAKE_CXX_LINK_EXECUTABLE) - - # CGAL Platform configuration tests - LOG_VARIABLE(CGAL_CFG_BOOL_IN_TEMPLATE_BUG) - LOG_VARIABLE(CGAL_CFG_CCTYPE_MACRO_BUG) - LOG_VARIABLE(CGAL_CFG_COMMA_BUG) - LOG_VARIABLE(CGAL_CFG_CONVERSION_OPERATOR_BUG) - LOG_VARIABLE(CGAL_CFG_DEEP_DEPENDENT_TEMPLATE_BUG) - LOG_VARIABLE(CGAL_CFG_DENORMALS_COMPILE_BUG) - LOG_VARIABLE(CGAL_CFG_IEEE_754_BUG) - LOG_VARIABLE(CGAL_CFG_ISTREAM_INT_BUG) - LOG_VARIABLE(CGAL_CFG_LONGNAME_BUG) - LOG_VARIABLE(CGAL_CFG_MATCHING_BUG_3) - LOG_VARIABLE(CGAL_CFG_MATCHING_BUG_4) - LOG_VARIABLE(CGAL_CFG_MATCHING_BUG_5) - LOG_VARIABLE(CGAL_CFG_MATCHING_BUG_6) - LOG_VARIABLE(CGAL_CFG_MISSING_TEMPLATE_VECTOR_CONSTRUCTORS_BUG) - LOG_VARIABLE(CGAL_CFG_NESTED_CLASS_FRIEND_DECLARATION_BUG) - LOG_VARIABLE(CGAL_CFG_NET2003_MATCHING_BUG) - LOG_VARIABLE(CGAL_CFG_NO_KOENIG_LOOKUP) - LOG_VARIABLE(CGAL_CFG_NO_LIMITS) - LOG_VARIABLE(CGAL_CFG_NO_LOCALE) - LOG_VARIABLE(CGAL_CFG_NO_LONG_DOUBLE_IO) - LOG_VARIABLE(CGAL_CFG_NO_LONG_LONG) - LOG_VARIABLE(CGAL_CFG_NO_NEXTAFTER) - LOG_VARIABLE(CGAL_CFG_NO_STDC_NAMESPACE) - LOG_VARIABLE(CGAL_CFG_NO_STL) - LOG_VARIABLE(CGAL_CFG_NO_TMPL_IN_TMPL_DEPENDING_FUNCTION_PARAM) - LOG_VARIABLE(CGAL_CFG_NO_TMPL_IN_TMPL_PARAM) - LOG_VARIABLE(CGAL_CFG_NO_TWO_STAGE_NAME_LOOKUP) - LOG_VARIABLE(CGAL_CFG_NUMERIC_LIMITS_BUG) - LOG_VARIABLE(CGAL_CFG_OUTOFLINE_MEMBER_DEFINITION_BUG) - LOG_VARIABLE(CGAL_CFG_OUTOFLINE_TEMPLATE_MEMBER_DEFINITION_BUG_2) - LOG_VARIABLE(CGAL_CFG_OUTOFLINE_TEMPLATE_MEMBER_DEFINITION_BUG) - LOG_VARIABLE(CGAL_CFG_SUNPRO_RWSTD) - LOG_VARIABLE(CGAL_CFG_TYPENAME_BEFORE_DEFAULT_ARGUMENT_BUG) - LOG_VARIABLE(CGAL_CFG_USING_BASE_MEMBER_BUG_2) - LOG_VARIABLE(CGAL_CFG_USING_BASE_MEMBER_BUG_3) - LOG_VARIABLE(CGAL_CFG_USING_BASE_MEMBER_BUG) - - - # CGAL third party libraries - LOG_VARIABLE(CGAL_USE_BOOST) - LOG_VARIABLE(CGAL_USE_BOOST_PROGRAM_OPTIONS) - LOG_VARIABLE(CGAL_USE_X11) - LOG_VARIABLE(CGAL_USE_GMP) - LOG_VARIABLE(CGAL_USE_GMPXX) - LOG_VARIABLE(CGAL_USE_MPFR) - LOG_VARIABLE(CGAL_USE_CORE) - LOG_VARIABLE(CGAL_USE_CGAL_CORE) - LOG_VARIABLE(CGAL_USE_ZLIB) - LOG_VARIABLE(CGAL_USE_LIDIA) - LOG_VARIABLE(CGAL_USE_LEDA) - LOG_VARIABLE(CGAL_USE_LEDAWIN) - LOG_VARIABLE(CGAL_USE_QT) - LOG_VARIABLE(CGAL_USE_TAUCS) - LOG_LIST(CGAL_3RD_PARTY_DEFINITIONS " ") - LOG_LIST(CGAL_3RD_PARTY_INCLUDE_DIRS "-I") - LOG_LIST(CGAL_3RD_PARTY_LIBRARIES " ") - - - # Settings to compile CGAL libraries and with CGAL libraries - LOG_LIST(CGAL_DEFINITIONS " ") - LOG_LIST(CGAL_INCLUDE_DIRS "-I") - LOG_LIST(CGAL_LIB_CXX_FLAGS " ") - LOG_VARIABLE(CGAL_LIB_EXE_LINKER_FLAGS) - LOG_VARIABLE(CGAL_LIB_SHARED_LINKER_FLAGS) - LOG_LIST(CGAL_LIBRARIES " ") - - - MESSAGE(STATUS "--------------- End CMake Variable Logging (${COMMENT}) ---------------") - -ENDMACRO (LOG_CMAKE_VARIABLES)