diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2017-04-17 14:54:46 -0700 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2017-04-17 16:36:06 -0700 |
| commit | 328ea226724d7e3ccdf39f29bcb20ce781737ef1 (patch) | |
| tree | b193618f5eb0b07ad48135392203c7c74a3edd19 | |
| parent | 2d8f1d05f9cb4b4237faabc8fe6a69567eddc449 (diff) | |
cmake: fix off-by-one on version check for swig
Change test to >=, then adjust version from 2.0.3 to 2.0.4 on master.
On next branch, the version (2.0.11) had not be adjusted to account
for the previous > behavior, so was failing configuration on
min-version test builds.
| -rw-r--r-- | CMakeLists.txt | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index e12334c3f8..0df17a21f2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -54,7 +54,7 @@ include(GrVersion) #setup version info # Minimum dependency versions for central dependencies: set(GR_BOOST_MIN_VERSION "1.48") -set(GR_SWIG_MIN_VERSION "2.0.3") +set(GR_SWIG_MIN_VERSION "2.0.4") set(GR_CMAKE_MIN_VERSION "2.8.12") set(GR_MAKO_MIN_VERSION "0.4.2") set(GR_PYTHON_MIN_VERSION "2.7") @@ -347,7 +347,8 @@ find_package(SWIG) if(SWIG_FOUND) set(SWIG_VERSION_CHECK FALSE) - if("${SWIG_VERSION}" VERSION_GREATER ${GR_SWIG_MIN_VERSION}) + if("${SWIG_VERSION}" VERSION_EQUAL ${GR_SWIG_MIN_VERSION} OR + "${SWIG_VERSION}" VERSION_GREATER ${GR_SWIG_MIN_VERSION}) set(SWIG_VERSION_CHECK TRUE) endif() endif(SWIG_FOUND) |