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

Merge pull request #1560 from lrineau/Installation-fix_CGAL_VERSION_issue_1559-lrineau 

Fix CGAL_VERSION in CGALConfig.cmake
This commit is contained in:
Laurent Rineau 2016-10-17 10:23:05 +02:00 committed by GitHub
parent 6e5919df73 e5b441feaa
commit 272e53ae2f
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Installation/cmake/modules/CGALConfig_binary.cmake.in
View File

@ -74,6 +74,7 @@ set(CGAL_GRAPHICSVIEW_PACKAGE_DIR "@CGAL_GRAPHICSVIEW_PACKAGE_DIR@")
set(CGAL_MAJOR_VERSION "@CGAL_MAJOR_VERSION@" )
set(CGAL_MINOR_VERSION "@CGAL_MINOR_VERSION@" )
set(CGAL_BUGFIX_VERSION "@CGAL_BUGFIX_VERSION@" )
set(CGAL_BUILD_VERSION "@CGAL_BUILD_VERSION@" )
set(CGAL_SCM_BRANCH_NAME "@CGAL_SCM_BRANCH_NAME@")
set(CGAL_GIT_SHA1 "@CGAL_GIT_SHA1@")
@ -99,7 +100,7 @@ set(CGAL_LIBRARIES_DIR "@CGAL_LIBRARIES_DIR@" )
# If CGAL_ImageIO is built, tell if it was linked with Zlib.
set(CGAL_ImageIO_USE_ZLIB "@CGAL_ImageIO_USE_ZLIB@" )
set(CGAL_VERSION "${CGAL_MAJOR_VERSION}.${CGAL_MINOR_VERSION}.${CGAL_BUILD_VERSION}")
set(CGAL_VERSION "${CGAL_MAJOR_VERSION}.${CGAL_MINOR_VERSION}.${CGAL_BUGFIX_VERSION}")
set(CGAL_USE_FILE "${CGAL_MODULES_DIR}/UseCGAL.cmake" )

3
Installation/cmake/modules/CGALConfig_install.cmake.in
View File

@ -17,6 +17,7 @@ string(REPLACE "@CGAL_INSTALL_CMAKE_DIR@" "" CGAL_INSTALL_PREFIX "${CGAL_CONFIG_
set(CGAL_MAJOR_VERSION "@CGAL_MAJOR_VERSION@" )
set(CGAL_MINOR_VERSION "@CGAL_MINOR_VERSION@" )
set(CGAL_BUGFIX_VERSION "@CGAL_BUGFIX_VERSION@" )
set(CGAL_BUILD_VERSION "@CGAL_BUILD_VERSION@" )
set(CGAL_SCM_BRANCH_NAME "@CGAL_SCM_BRANCH_NAME@")
set(CGAL_GIT_SHA1 "@CGAL_GIT_SHA1@")
@ -42,7 +43,7 @@ set(CGAL_LIBRARIES_DIR "${CGAL_INSTALL_PREFIX}/@CGAL_INSTALL_LIB_DIR@" )
# If CGAL_ImageIO is built, tell if it was linked with Zlib.
set(CGAL_ImageIO_USE_ZLIB "@CGAL_ImageIO_USE_ZLIB@" )
set(CGAL_VERSION "${CGAL_MAJOR_VERSION}.${CGAL_MINOR_VERSION}.${CGAL_BUILD_VERSION}")
set(CGAL_VERSION "${CGAL_MAJOR_VERSION}.${CGAL_MINOR_VERSION}.${CGAL_BUGFIX_VERSION}")
set(CGAL_USE_FILE "${CGAL_MODULES_DIR}/UseCGAL.cmake" )
set(CGAL_GRAPHICSVIEW_PACKAGE_DIR "${CGAL_INCLUDE_DIRS}/CGAL/" CACHE INTERNAL "Directory containing the GraphicsView package")