songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix a bug 

```
== CMake setup ==
CMake Warning (dev) at Installation/lib/cmake/CGAL/CGALConfigVersion.cmake:6 (set):
  Cannot set "CGAL_MAJOR_VERSION": current scope has no parent.
Call Stack (most recent call first):
  CGALConfigVersion.cmake:1 (include)
  CMakeLists.txt:13 (include)
This warning is for project developers.  Use -Wno-dev to suppress it.

```
This commit is contained in:
Laurent Rineau 2020-07-23 18:24:06 +02:00
parent 23f8f46b31
commit 1ffbd83480
2 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Installation/lib/cmake/CGAL/CGALConfig.cmake
View File

@ -150,6 +150,7 @@ foreach(cgal_lib ${CGAL_LIBRARIES})
endif() endif()
endforeach() endforeach()
include(${CGAL_CONFIG_DIR}/CGALConfigVersion.cmake)
# #
# #

6
Installation/lib/cmake/CGAL/CGALConfigVersion.cmake
View File

@ -2,12 +2,6 @@ set(CGAL_MAJOR_VERSION 5)
set(CGAL_MINOR_VERSION 1) set(CGAL_MINOR_VERSION 1)
set(CGAL_BUGFIX_VERSION 0) set(CGAL_BUGFIX_VERSION 0)
include(${CMAKE_CURRENT_LIST_DIR}/CGALConfigBuildVersion.cmake) include(${CMAKE_CURRENT_LIST_DIR}/CGALConfigBuildVersion.cmake)
if(NOT CMAKE_SCRIPT_MODE_FILE)
set(CGAL_MAJOR_VERSION ${CGAL_MAJOR_VERSION} PARENT_SCOPE)
set(CGAL_MINOR_VERSION ${CGAL_MINOR_VERSION} PARENT_SCOPE)
set(CGAL_BUGFIX_VERSION ${CGAL_BUGFIX_VERSION} PARENT_SCOPE)
set(CGAL_BUILD_VERSION ${CGAL_BUILD_VERSION} PARENT_SCOPE)
endif()
set(CGAL_VERSION_PUBLIC_RELEASE_VERSION "5.1-beta2") set(CGAL_VERSION_PUBLIC_RELEASE_VERSION "5.1-beta2")
set(CGAL_VERSION_PUBLIC_RELEASE_NAME "CGAL-${CGAL_VERSION_PUBLIC_RELEASE_VERSION}") set(CGAL_VERSION_PUBLIC_RELEASE_NAME "CGAL-${CGAL_VERSION_PUBLIC_RELEASE_VERSION}")