Merge pull request #4877 from lrineau/CGAL-CGALConfigVersion__fixes-GF

CMake: Fix a bug in PR #4850
CGAL · Jul 24, 2020 · ac5b6ff · ac5b6ff
2 parents a84927d + 1ffbd83
commit ac5b6ff
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 6 deletions.
diff --git a/Installation/lib/cmake/CGAL/CGALConfig.cmake b/Installation/lib/cmake/CGAL/CGALConfig.cmake
@@ -150,6 +150,7 @@ foreach(cgal_lib ${CGAL_LIBRARIES})
   endif()
 endforeach()
 
+include(${CGAL_CONFIG_DIR}/CGALConfigVersion.cmake)
 
 #
 #

diff --git a/Installation/lib/cmake/CGAL/CGALConfigVersion.cmake b/Installation/lib/cmake/CGAL/CGALConfigVersion.cmake
@@ -2,12 +2,6 @@ set(CGAL_MAJOR_VERSION 5)
 set(CGAL_MINOR_VERSION 1)
 set(CGAL_BUGFIX_VERSION 0)
 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_NAME "CGAL-${CGAL_VERSION_PUBLIC_RELEASE_VERSION}")
-Original file line number
+Diff line change
@@ Expand Up / @@ -150,6 +150,7 @@ foreach(cgal_lib ${CGAL_LIBRARIES}) @@
       endif()
     endforeach()
+    include(${CGAL_CONFIG_DIR}/CGALConfigVersion.cmake)
     #
     #
@@ Expand Down @@