From 69215a9828c10569043b54385eef0402726e4a12 Mon Sep 17 00:00:00 2001
From: seanyen <seanyen@microsoft.com>
Date: Tue, 12 Nov 2019 22:12:50 -0800
Subject: [PATCH] Corrected PYTHON_EXT_SUFFIX usage.
---
CMakeLists.txt | 5 -----
python/CMakeLists.txt | 7 +------
2 files changed, 1 insertion(+), 11 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b9777ec9..e23907be 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -130,11 +130,6 @@ SET(${PROJECT_NAME}_SOURCES
)
ADD_LIBRARY(${PROJECT_NAME} SHARED ${${PROJECT_NAME}_SOURCES} ${${PROJECT_NAME}_HEADERS})
-SET(LIB_${PROJECT_NAME}_SUFFIX ${PYTHON_EXT_SUFFIX})
-IF(APPLE)
- STRING(REPLACE ".so" ".dylib" LIB_${PROJECT_NAME}_SUFFIX ${LIB_${PROJECT_NAME}_SUFFIX})
-ENDIF(APPLE)
-SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES SUFFIX "${LIB_${PROJECT_NAME}_SUFFIX}")
TARGET_COMPILE_OPTIONS(${PROJECT_NAME} PRIVATE $<$<CXX_COMPILER_ID:MSVC>:-bigobj>)
TARGET_LINK_BOOST_PYTHON(${PROJECT_NAME})
diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt
index 5d644dbd..ccd1ed70 100644
--- a/python/CMakeLists.txt
+++ b/python/CMakeLists.txt
@@ -32,12 +32,7 @@ TARGET_LINK_BOOST_PYTHON(${PYWRAP})
SET(${PYWRAP}_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/${PYTHON_SITELIB})
SET_PROPERTY(TARGET ${PYWRAP} PROPERTY LINKER_LANGUAGE CXX)
-IF(APPLE)
- # We need to change the extension for python bindings
- SET_TARGET_PROPERTIES(${PYWRAP} PROPERTIES SUFFIX ".so")
-ELSEIF(WIN32)
- SET_TARGET_PROPERTIES(${PYWRAP} PROPERTIES SUFFIX ".pyd")
-ENDIF(APPLE)
+SET_TARGET_PROPERTIES(${PYWRAP} PROPERTIES SUFFIX ${PYTHON_EXT_SUFFIX})
SET_TARGET_PROPERTIES(${PYWRAP} PROPERTIES
LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/python/${PROJECT_NAME}")
--
GitLab