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

Do not use CGAL_INSTALLATION_PACKAGE_DIR with Subversion_GET_(URL|REVISION) 

At the first run of CMake, CGAL_INSTALLATION_PACKAGE_DIR is not known when
Subversion_GET_REVISION and Subversion_GET_URL are called. That gives an
svn error, that is fixed at the second run of CMake. Use CMAKE_SOURCE_DIR
and CMAKE_CURRENT_SOURCE_DIR instead.
This commit is contained in:
Laurent Rineau 2011-11-17 14:12:19 +00:00
parent c4eb6ccaf0
commit 519ab4f40f
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -64,9 +64,7 @@ if ( ${CGAL_SCM_NAME} STREQUAL "svn" )
set(${variable} ${${variable}} PARENT_SCOPE)
endfunction(Subversion_GET_URL)
Subversion_GET_URL("${CGAL_INSTALLATION_PACKAGE_DIR}" CGAL_INSTALLATION_SVN_URL)
# Remove the "/Installation" suffix.
string(REGEX REPLACE "(.*)/Installation" "\\1" CGAL_TMP_SVN_BRANCH_NAME "${CGAL_INSTALLATION_SVN_URL}")
Subversion_GET_URL("${CMAKE_CURRENT_SOURCE_DIR}" CGAL_TMP_SVN_BRANCH_NAME)
# Remove the prefix of the URL "https://scm.gforge.inria.fr/".
string(REGEX REPLACE "[a-z+]+://[a-z0-9.]+" "" CGAL_TMP_SVN_BRANCH_NAME "${CGAL_TMP_SVN_BRANCH_NAME}")

2
Installation/CMakeLists.txt
View File

@ -134,7 +134,7 @@ if ( CGAL_BRANCH_BUILD )
if ( ${CGAL_SCM_NAME} STREQUAL "svn" )
# The function Subversion_GET_REVISION is defined in ../CMakeLists.txt
Subversion_GET_REVISION("${CGAL_INSTALLATION_PACKAGE_DIR}" CGAL_TMP_REVISION)
Subversion_GET_REVISION("${CMAKE_SOURCE_DIR}" CGAL_TMP_REVISION)
set(CGAL_CREATED_SVN_REVISION "${CGAL_TMP_REVISION}")
message(STATUS "CGAL_SVN_REVISION is ${CGAL_TMP_REVISION}")