aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuillaume Bâty <guillaume.baty@gmx.fr>2016-02-09 16:54:53 +0100
committerGuillaume Bâty <guillaume.baty@gmx.fr>2016-02-09 17:01:14 +0100
commit3cf2a9782dc1fe069f1f42993c5438d7dbe5cdf8 (patch)
treef52838c1d79dd78505fe270ce9f8f9795cdf3b91
parent426c1e990a0c6e3d40d5f475771bd850ed506b01 (diff)
Remove check on version less than 3.5 in PYTHON_EXTENSION_SUFFIX def
This test is useless because PYTHON_MULTIARCH_SUFFIX can be defined for all py3.4 and py3.5 versions. The check of PYTHON_MULTIARCH_SUFFIX existence is sufficient to check if MULTIARCH support is enabled.
-rw-r--r--CMakeLists.txt10
1 files changed, 3 insertions, 7 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a7c1f96..6f112d2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -64,14 +64,10 @@ if (UNIX AND NOT APPLE)
else()
set(PYTHON3_RELEASE_SUFFIX "m")
endif()
- if (PYTHON_VERSION_MINOR LESS 5)
- set(PYTHON_EXTENSION_SUFFIX ".cpython-${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}${PYTHON3_RELEASE_SUFFIX}")
+ if(PYTHON_MULTIARCH_SUFFIX)
+ set(PYTHON_EXTENSION_SUFFIX ".cpython-${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}${PYTHON3_RELEASE_SUFFIX}-${PYTHON_MULTIARCH_SUFFIX}")
else()
- if(PYTHON_MULTIARCH_SUFFIX)
- set(PYTHON_EXTENSION_SUFFIX ".cpython-${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}${PYTHON3_RELEASE_SUFFIX}-${PYTHON_MULTIARCH_SUFFIX}")
- else()
- set(PYTHON_EXTENSION_SUFFIX ".cpython-${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}${PYTHON3_RELEASE_SUFFIX}")
- endif()
+ set(PYTHON_EXTENSION_SUFFIX ".cpython-${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}${PYTHON3_RELEASE_SUFFIX}")
endif()
else()
message( FATAL_ERROR "Unsupported PYTHON_VERSION=${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.${PYTHON_VERSION_PATCH}!" )