Merge branch 'master' of github.com:pantor/ruckig

pantor · Jun 25, 2021 · 83dc93b · 83dc93b
2 parents b76da24 + 36dca69
commit 83dc93b
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -41,7 +41,7 @@ jobs:
         cmakeListsOrSettingsJson: CMakeListsTxtAdvanced
         buildDirectory: "${{ github.workspace }}/build"
         cmakeBuildType: 'Release'
-        cmakeAppendedArgs: '-DBUILD_PYTHON_MODULE=ON -DBUILD_EXAMPLES=ON -DBUILD_BENCHMARK=ON'
+        cmakeAppendedArgs: '-DBUILD_PYTHON_MODULE=ON -DBUILD_EXAMPLES=ON -DBUILD_BENCHMARK=ON -DCMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG=. -DCMAKE_LIBRARY_OUTPUT_DIRECTORY_DEBUG=.'
 
     - name: Run Examples (Unix)
       if: matrix.os == 'ubuntu-latest' || matrix.os == 'macos-latest'
@@ -52,7 +52,7 @@ jobs:
     - name: Run Examples (Windows)
       if: matrix.os == 'windows-latest'
       run: |
-        .\build\Debug\example-position.exe > $null
+        .\build\example-position.exe > $null
         python3 .\examples\position.py > $null
 
     - name: Test

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -79,7 +79,6 @@ if(BUILD_PYTHON_MODULE)
 
   set_target_properties(python_ruckig PROPERTIES OUTPUT_NAME ruckig)
   set_target_properties(python_ruckig PROPERTIES ARCHIVE_OUTPUT_NAME python_ruckig)
-  set_target_properties(python_ruckig PROPERTIES LIBRARY_OUTPUT_DIRECTORY $<1:${CMAKE_BINARY_DIR}>)
 endif()
 
 

diff --git a/MANIFEST.in b/MANIFEST.in
@@ -1,7 +1,5 @@
 recursive-include cmake *
 recursive-include include *
 recursive-include src *
-recursive-include test *
-recursive-include examples *
 
 include CMakeLists.txt
diff --git a/setup.py b/setup.py
@@ -47,10 +47,15 @@ def build_extension(self, ext):
 
         cmake_args = [
             '-DCMAKE_LIBRARY_OUTPUT_DIRECTORY=' + extdir,
+            '-DCMAKE_ARCHIVE_OUTPUT_DIRECTORY=' + extdir,
+            '-DCMAKE_LIBRARY_OUTPUT_DIRECTORY_RELEASE=' + extdir,
+            '-DCMAKE_ARCHIVE_OUTPUT_DIRECTORY_RELEASE=' + extdir,
             '-DPYTHON_EXECUTABLE={}'.format(sys.executable),
             '-DEXAMPLE_VERSION_INFO={}'.format(self.distribution.get_version()),
             '-DCMAKE_BUILD_TYPE=' + build_type,
             '-DBUILD_PYTHON_MODULE=ON',
+            '-DBUILD_EXAMPLES=OFF',
+            '-DBUILD_TESTS=OFF',
             '-DBUILD_SHARED_LIBS=OFF',
             '-DCMAKE_POSITION_INDEPENDENT_CODE=ON',
         ]