From f5a413104c468084580ea37a030810ce41a8a211 Mon Sep 17 00:00:00 2001
From: pantor <lars.berscheid@online.de>
Date: Mon, 29 Mar 2021 13:50:38 +0200
Subject: [PATCH] fix python cd

---
 .github/workflows/publish.yml |  3 ++-
 doc/Doxyfile                  |  2 +-
 package.xml                   |  2 +-
 setup.py                      | 12 +++++-------
 4 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 6c743afb..4be075cd 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -9,7 +9,8 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [windows-latest, macos-latest]
+        # os: [windows-latest, macos-latest]
+        os: [macos-latest]
         python-version: [3.6, 3.7, 3.8, 3.9]
 
     steps:
diff --git a/doc/Doxyfile b/doc/Doxyfile
index cfbe2f04..7b5a4715 100644
--- a/doc/Doxyfile
+++ b/doc/Doxyfile
@@ -38,7 +38,7 @@ PROJECT_NAME           = "Ruckig"
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = 0.2.5
+PROJECT_NUMBER         = 0.2.6
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a
diff --git a/package.xml b/package.xml
index b48fa0a9..0387f63b 100644
--- a/package.xml
+++ b/package.xml
@@ -2,7 +2,7 @@
 <?xml-model href="http://download.ros.org/schema/package_format2.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
 <package format="2">
   <name>ruckig</name>
-  <version>0.2.5</version>
+  <version>0.2.6</version>
   <description>Online Trajectory Generation. Real-time. Time-optimal. Jerk-constrained.</description>
   <author>Lars Berscheid</author>
   <maintainer email="lars.berscheid@kit.edu">Lars Berscheid</maintainer>
diff --git a/setup.py b/setup.py
index 90eb08fa..cec2e261 100644
--- a/setup.py
+++ b/setup.py
@@ -45,21 +45,19 @@ def build_extension(self, ext):
         build_type = os.environ.get('BUILD_TYPE', 'Release')
         build_args = ['--config', build_type]
 
-        # Pile all .so in one place and use $ORIGIN as RPATH
         cmake_args = [
             '-DCMAKE_LIBRARY_OUTPUT_DIRECTORY=' + extdir,
             '-DPYTHON_EXECUTABLE={}'.format(sys.executable),
             '-DEXAMPLE_VERSION_INFO={}'.format(self.distribution.get_version()),
-            # '-DCMAKE_BUILD_WITH_INSTALL_RPATH=TRUE',
-            # '-DCMAKE_INSTALL_RPATH={}'.format('$ORIGIN'),
             '-DCMAKE_BUILD_TYPE=' + build_type,
             '-DBUILD_PYTHON_MODULE=ON',
             '-DBUILD_SHARED_LIBS=OFF',
+            '-DCMAKE_POSITION_INDEPENDENT_CODE=ON',
         ]
 
-        env = os.environ.copy()
-        env['CXXFLAGS'] = '{} -DVERSION_INFO=\\"{}\\"'.format(env.get('CXXFLAGS', ''),
-                                                              self.distribution.get_version())
+        # env = os.environ.copy()
+        # env['CXXFLAGS'] = '{} -DVERSION_INFO=\\"{}\\"'.format(env.get('CXXFLAGS', ''),
+        #                                                       self.distribution.get_version())
         
         if not os.path.exists(self.build_temp):
             os.makedirs(self.build_temp)
@@ -70,7 +68,7 @@ def build_extension(self, ext):
 
 setup(
     name='ruckig',
-    version='0.2.5',
+    version='0.2.6',
     description='Online Trajectory Generation. Real-time. Time-optimal. Jerk-constrained.',
     long_description=long_description,
     long_description_content_type='text/markdown',