From b2243d950b84f26c834002a70ac6a96b3409b557 Mon Sep 17 00:00:00 2001 From: Duy-Nguyen Ta Date: Tue, 21 Mar 2017 18:05:41 -0400 Subject: [PATCH] get compiler settings from cmake --- cython/gtsam/setup.py.in | 13 ++++++------- cython/gtsam_unstable/setup.py.in | 10 +++++----- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/cython/gtsam/setup.py.in b/cython/gtsam/setup.py.in index 59af17c3c..7efbb9d68 100644 --- a/cython/gtsam/setup.py.in +++ b/cython/gtsam/setup.py.in @@ -2,12 +2,11 @@ from distutils.core import setup from distutils.extension import Extension from Cython.Build import cythonize import eigency -from sys import platform +import sys +import os -# force clang use libc++ instead of the default libstdc++ shipped with MacOSX, which doesn't support c++11 -libc_flag = [] -if platform == "darwin": - libc_flag = ["-stdlib=libc++"] +os.environ["CXX"] = "${CMAKE_CXX_COMPILER}" +os.environ["CC"] = "${CMAKE_C_COMPILER}" setup( ext_modules = cythonize(Extension( @@ -19,6 +18,6 @@ setup( libraries = ['gtsam'], library_dirs = ["${CMAKE_BINARY_DIR}/gtsam"], language="c++", - extra_compile_args=["-std=c++11"] + libc_flag, - extra_link_args=libc_flag)), + extra_compile_args="${CMAKE_CXX_FLAGS}".split(), + extra_link_args="${CMAKE_SHARED_LINKER_FLAGS}".split())) ) diff --git a/cython/gtsam_unstable/setup.py.in b/cython/gtsam_unstable/setup.py.in index 548802c67..7e81f5b7d 100644 --- a/cython/gtsam_unstable/setup.py.in +++ b/cython/gtsam_unstable/setup.py.in @@ -3,13 +3,13 @@ from distutils.extension import Extension from Cython.Build import cythonize import eigency import sys +import os # so that it can find the wrapped gtsam package sys.path.append("..") -libc_flag = [] -if sys.platform == "darwin": - libc_flag = ["-stdlib=libc++"] +os.environ["CXX"] = "${CMAKE_CXX_COMPILER}" +os.environ["CC"] = "${CMAKE_C_COMPILER}" setup( ext_modules=cythonize(Extension( @@ -21,7 +21,7 @@ setup( libraries=['gtsam', 'gtsam_unstable'], library_dirs=["${GTSAM_DIR}/../../"], language="c++", - extra_compile_args=["-std=c++11"] + libc_flag, - extra_link_args=libc_flag)), + extra_compile_args="${CMAKE_CXX_FLAGS}".split(), + extra_link_args="${CMAKE_SHARED_LINKER_FLAGS}".split())) )