mirror of https://github.com/CGAL/cgal
Move config/ to cmake/modules/config/
That way, the directory will be installed along with CMake modules.
This commit is contained in:
Laurent Rineau
parent
2cec8e6aca
commit
777717ba7e
|
|
@ -199,7 +199,7 @@ if ( CGAL_BRANCH_BUILD )
|
||||||
|
|
||||||
file(REMOVE ${CMAKE_BINARY_DIR}/include/CGAL/version.h)
|
file(REMOVE ${CMAKE_BINARY_DIR}/include/CGAL/version.h)
|
||||||
string(TIMESTAMP CGAL_CREATED_RELEASE_DATE "%Y%m%d")
|
string(TIMESTAMP CGAL_CREATED_RELEASE_DATE "%Y%m%d")
|
||||||
configure_file(${CGAL_INSTALLATION_PACKAGE_DIR}/config/version.h.in ${CMAKE_BINARY_DIR}/include/CGAL/version.h @ONLY)
|
configure_file(${CGAL_INSTALLATION_PACKAGE_DIR}/cmake/modules/config/version.h.in ${CMAKE_BINARY_DIR}/include/CGAL/version.h @ONLY)
|
||||||
|
|
||||||
#
|
#
|
||||||
# Duplicate files
|
# Duplicate files
|
||||||
|
|
@ -706,7 +706,7 @@ macro(add_config_flag flag)
|
||||||
endmacro()
|
endmacro()
|
||||||
|
|
||||||
if(NOT CMAKE_CROSSCOMPILING)
|
if(NOT CMAKE_CROSSCOMPILING)
|
||||||
file(GLOB all_config_tests "${CGAL_INSTALLATION_PACKAGE_DIR}/config/testfiles/*.cpp")
|
file(GLOB all_config_tests "${CGAL_MODULES_DIR}/config/testfiles/*.cpp")
|
||||||
list(SORT all_config_tests)
|
list(SORT all_config_tests)
|
||||||
|
|
||||||
file(WRITE ${CMAKE_BINARY_DIR}/include/CGAL/compiler_config.h "//\n// compiler_config.h is included by CGAL headers to load the needed compiler settings.\n//\n// DO NOT EDIT compiler_config.h. It is generated by CMake.\n//\n\n")
|
file(WRITE ${CMAKE_BINARY_DIR}/include/CGAL/compiler_config.h "//\n// compiler_config.h is included by CGAL headers to load the needed compiler settings.\n//\n// DO NOT EDIT compiler_config.h. It is generated by CMake.\n//\n\n")
|
||||||
|
|
@ -1109,7 +1109,7 @@ because IPE_FOUND is false.")
|
||||||
|
|
||||||
if(NOT DEFINED CGAL_CHECK_SYNTAX_ONLY)
|
if(NOT DEFINED CGAL_CHECK_SYNTAX_ONLY)
|
||||||
execute_process(COMMAND
|
execute_process(COMMAND
|
||||||
${CMAKE_CXX_COMPILER} -x c++ -fsyntax-only ${CMAKE_CURRENT_SOURCE_DIR}/config/support/test_syntaxonly.cpp
|
${CMAKE_CXX_COMPILER} -x c++ -fsyntax-only ${CGAL_MODULES_DIR}/config/support/test_syntaxonly.cpp
|
||||||
ERROR_QUIET
|
ERROR_QUIET
|
||||||
RESULT_VARIABLE ok)
|
RESULT_VARIABLE ok)
|
||||||
if(ok EQUAL 0)
|
if(ok EQUAL 0)
|
||||||
|
|
|
||||||
|
|
@ -160,11 +160,11 @@ if( NOT CGAL_MACROS_FILE_INCLUDED )
|
||||||
set ( ${LIB}_VERSION "unknown" )
|
set ( ${LIB}_VERSION "unknown" )
|
||||||
|
|
||||||
if(NOT CMAKE_CROSSCOMPILING)
|
if(NOT CMAKE_CROSSCOMPILING)
|
||||||
if(EXISTS "${CGAL_INSTALLATION_PACKAGE_DIR}/config/support/print_${LIB}_version.cpp")
|
if(EXISTS "${CGAL_MODULES_DIR}/config/support/print_${LIB}_version.cpp")
|
||||||
try_run( ${LIB}_RUN_RES
|
try_run( ${LIB}_RUN_RES
|
||||||
${LIB}_COMPILE_RES
|
${LIB}_COMPILE_RES
|
||||||
"${CMAKE_BINARY_DIR}"
|
"${CMAKE_BINARY_DIR}"
|
||||||
"${CGAL_INSTALLATION_PACKAGE_DIR}/config/support/print_${LIB}_version.cpp"
|
"${CGAL_MODULES_DIR}/config/support/print_${LIB}_version.cpp"
|
||||||
CMAKE_FLAGS "-DINCLUDE_DIRECTORIES:STRING=${${PKG}_INCLUDE_DIR};${${PKG}_DEPENDENCY_INCLUDE_DIR}"
|
CMAKE_FLAGS "-DINCLUDE_DIRECTORIES:STRING=${${PKG}_INCLUDE_DIR};${${PKG}_DEPENDENCY_INCLUDE_DIR}"
|
||||||
"-DLINK_LIBRARIES:STRING=${${PKG}_LIBRARIES};${${PKG}_DEPENDENCY_LIBRARIES}"
|
"-DLINK_LIBRARIES:STRING=${${PKG}_LIBRARIES};${${PKG}_DEPENDENCY_LIBRARIES}"
|
||||||
"-DLINK_DIRECTORIES:STRING=${${PKG}_LIBRARIES_DIR};${${PKG}_DEPENDENCY_LIBRARIES_DIR}"
|
"-DLINK_DIRECTORIES:STRING=${${PKG}_LIBRARIES_DIR};${${PKG}_DEPENDENCY_LIBRARIES_DIR}"
|
||||||
|
|
|
||||||
|
|
@ -23,7 +23,7 @@ include(${CMAKE_CURRENT_LIST_DIR}/CGAL_TweakFindBoost.cmake)
|
||||||
else()
|
else()
|
||||||
try_run( CGAL_test_cpp_version_RUN_RES CGAL_test_cpp_version_COMPILE_RES
|
try_run( CGAL_test_cpp_version_RUN_RES CGAL_test_cpp_version_COMPILE_RES
|
||||||
"${CMAKE_BINARY_DIR}"
|
"${CMAKE_BINARY_DIR}"
|
||||||
"${CGAL_INSTALLATION_PACKAGE_DIR}/config/support/CGAL_test_cpp_version.cpp"
|
"${CGAL_MODULES_DIR}/config/support/CGAL_test_cpp_version.cpp"
|
||||||
RUN_OUTPUT_VARIABLE CGAL_cplusplus)
|
RUN_OUTPUT_VARIABLE CGAL_cplusplus)
|
||||||
message(STATUS "__cplusplus is ${CGAL_cplusplus}")
|
message(STATUS "__cplusplus is ${CGAL_cplusplus}")
|
||||||
if(NOT CGAL_test_cpp_version_RUN_RES)
|
if(NOT CGAL_test_cpp_version_RUN_RES)
|
||||||
|
|
|
||||||
|
|
@ -549,7 +549,7 @@ using std::max;
|
||||||
#if __has_feature(cxx_thread_local) || \
|
#if __has_feature(cxx_thread_local) || \
|
||||||
( (__GNUC__ * 100 + __GNUC_MINOR__) >= 408 && __cplusplus >= 201103L ) || \
|
( (__GNUC__ * 100 + __GNUC_MINOR__) >= 408 && __cplusplus >= 201103L ) || \
|
||||||
( _MSC_VER >= 1900 )
|
( _MSC_VER >= 1900 )
|
||||||
// see also Installation/config/support/CGAL_test_cpp_version.cpp
|
// see also Installation/cmake/modules/config/support/CGAL_test_cpp_version.cpp
|
||||||
#define CGAL_CAN_USE_CXX11_THREAD_LOCAL
|
#define CGAL_CAN_USE_CXX11_THREAD_LOCAL
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue