changed: update FindGoTools rule
upstream now has version in a separate header file. adjust code to support this case as well git-svn-id: http://svn.sintef.no/trondheim/IFEM/trunk@1891 e10b68d5-8a6e-419e-a041-bce267b0401d
This commit is contained in:
@@ -20,6 +20,10 @@ FIND_LIBRARY(GoTools_LIBRARIES
|
||||
# Check for newer GoTools
|
||||
EXECUTE_PROCESS(COMMAND cat "${GoTools_INCLUDE_DIRS}/GoTools/geometry/GoTools.h" OUTPUT_VARIABLE GOTOOLS_HEADER)
|
||||
STRING(REGEX MATCH "GO_VERSION_MAJOR ([0-9]+)" GoTools_VERSION_MAJOR ${GOTOOLS_HEADER})
|
||||
IF(NOT GoTools_VERSION_MAJOR)
|
||||
EXECUTE_PROCESS(COMMAND cat "${GoTools_INCLUDE_DIRS}/GoTools/geometry/GoTools_version.h" OUTPUT_VARIABLE GOTOOLS_HEADER)
|
||||
STRING(REGEX MATCH "GO_VERSION_MAJOR ([0-9]+)" GoTools_VERSION_MAJOR ${GOTOOLS_HEADER})
|
||||
ENDIF(NOT GoTools_VERSION_MAJOR)
|
||||
STRING(REGEX REPLACE "GO_VERSION_MAJOR ([0-9]+)" "\\1" GoTools_VERSION_MAJOR "${GoTools_VERSION_MAJOR}")
|
||||
STRING(REGEX MATCH "GO_VERSION_MINOR ([0-9]+)" GoTools_VERSION_MINOR ${GOTOOLS_HEADER})
|
||||
STRING(REGEX REPLACE "GO_VERSION_MINOR ([0-9]+)" "\\1" GoTools_VERSION_MINOR "${GoTools_VERSION_MINOR}")
|
||||
|
||||
Reference in New Issue
Block a user