mirror of https://github.com/CGAL/cgal
Merge branch 'CGAL-fix_cmake_3-GF'
Add the compatibility with CMake 3.0, without using any new feature. Tested in CGAL-4.5-Ic-104. Approved by the Release Manager.
This commit is contained in:
commit
3214507a45
|
|
@ -19,9 +19,20 @@ else()
|
|||
cmake_policy(VERSION 2.6)
|
||||
endif()
|
||||
|
||||
#
|
||||
# Compatibility with CMake 3.0
|
||||
#
|
||||
if(POLICY CMP0026)
|
||||
# Allow the LOCATION target property
|
||||
# http://www.cmake.org/cmake/help/v3.0/policy/CMP0026.html
|
||||
cmake_policy(SET CMP0026 OLD)
|
||||
endif()
|
||||
if(POLICY CMP0042)
|
||||
# Do not enable the use of MACOSX_RPATH
|
||||
# http://www.cmake.org/cmake/help/v3.0/policy/CMP0042.html
|
||||
cmake_policy(SET CMP0042 OLD)
|
||||
endif()
|
||||
|
||||
|
||||
#--------------------------------------------------------------------------------------------------
|
||||
#
|
||||
|
|
|
|||
|
|
@ -129,6 +129,7 @@ and <code>src/</code> directories).
|
|||
Properties of Point-Sampled Surfaces</i> packages. From CGAL
|
||||
version 4.5, Taucs, Blas and Lapack are no longer supported.
|
||||
</li>
|
||||
<li>CGAL is now compatible with the new CMake version 3.0.</li>
|
||||
</ul>
|
||||
|
||||
<h3>dD Geometry Kernel</h3>
|
||||
|
|
|
|||
|
|
@ -103,6 +103,8 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CGAL_RUNTIME_DIR})
|
|||
# set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_${CONF_TYPE} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
|
||||
#endforeach()
|
||||
|
||||
# TODO: Seems useless, because it is called again in ../CMakeLists.txt
|
||||
# Should probably be removed. -- Laurent Rineau, 2014/07/22
|
||||
create_CGALconfig_files()
|
||||
|
||||
set(CGAL_DIR ${CMAKE_BINARY_DIR})
|
||||
|
|
@ -110,7 +112,7 @@ set(CGAL_DIR ${CMAKE_BINARY_DIR})
|
|||
add_subdirectory(CGAL)
|
||||
|
||||
# search libs
|
||||
set(CGAL_CONFIGURED_LIBRARIES "" PARENT_SCOPE)
|
||||
set(CGAL_CONFIGURED_LIBRARIES "")
|
||||
|
||||
foreach(package ${CGAL_CONFIGURED_PACKAGES})
|
||||
file(GLOB CONFIGURED_LIBS_IN_PACKAGE ${package}/src/CGAL_*/CMakeLists.txt)
|
||||
|
|
|
|||
Loading…
Reference in New Issue