cleaning up

Author: tomvanmele

modules/CMakeLists.txt

@@ -5,4 +5,4 @@ add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/isolines)
 add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/triangulation)
 add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/geodistance)
 # add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/csgtree)
-add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/booleans)
+# add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/booleans)

modules/booleans/CMakeLists.txt

@@ -7,8 +7,7 @@ pybind11_add_module(booleans MODULE booleans.cpp)
 target_link_libraries(booleans PRIVATE igl::core)
 target_link_libraries(booleans PRIVATE igl::cgal)
 
-# set_target_properties(booleans PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/src/compas_libigl/booleans")
-
-# set_target_properties(booleans PROPERTIES LIBRARY_OUTPUT_DIRECTORY_RELEASE "${CMAKE_SOURCE_DIR}/src/compas_libigl/booleans")
+set_target_properties(booleans PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${CMAKE_SOURCE_DIR}/src/compas_libigl/booleans")
+set_target_properties(booleans PROPERTIES LIBRARY_OUTPUT_DIRECTORY_RELEASE "${CMAKE_SOURCE_DIR}/src/compas_libigl/booleans")
 
 configure_file(__init__.py "${CMAKE_SOURCE_DIR}/src/compas_libigl/booleans/__init__.py" COPYONLY)

modules/geodistance/CMakeLists.txt

@@ -6,10 +6,7 @@ pybind11_add_module(geodistance MODULE geodistance.cpp)
 
 target_link_libraries(geodistance PRIVATE igl::core)
 
-set_target_properties(geodistance PROPERTIES
-    LIBRARY_OUTPUT_DIRECTORY "${CMAKE_SOURCE_DIR}/src/compas_libigl/geodistance")
-
-set_target_properties(geodistance PROPERTIES
-    LIBRARY_OUTPUT_DIRECTORY_RELEASE "${CMAKE_SOURCE_DIR}/src/compas_libigl/geodistance")
+set_target_properties(geodistance PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${CMAKE_SOURCE_DIR}/src/compas_libigl/geodistance")
+set_target_properties(geodistance PROPERTIES LIBRARY_OUTPUT_DIRECTORY_RELEASE "${CMAKE_SOURCE_DIR}/src/compas_libigl/geodistance")
 
 configure_file(__init__.py "${CMAKE_SOURCE_DIR}/src/compas_libigl/geodistance/__init__.py" COPYONLY)

modules/geodistance/_geodistance.cpp

@@ -56,9 +56,10 @@ def build_extension(self, ext):
                       # During compiling stage, the python module always links to a temporary generated library which is going to be destroyed.
                       # Then importing the final installed module will return a link error
                       # The following commands will force the module to look up the its dynmaic linked library in the same folder
-                      '-DCMAKE_INSTALL_RPATH=@loader_path',
-                      '-DCMAKE_BUILD_WITH_INSTALL_RPATH:BOOL=ON',
-                      '-DCMAKE_INSTALL_RPATH_USE_LINK_PATH:BOOL=OFF']
+                      # '-DCMAKE_INSTALL_RPATH=@loader_path',
+                      # '-DCMAKE_BUILD_WITH_INSTALL_RPATH:BOOL=ON',
+                      # '-DCMAKE_INSTALL_RPATH_USE_LINK_PATH:BOOL=OFF'
+                      ]
 
         cfg = 'Debug' if self.debug else 'Release'
         build_args = ['--config', cfg]

setup.py

@@ -2,7 +2,7 @@
 from __future__ import division
 from __future__ import print_function
 
-from .booleans import *
+# from .booleans import *
 # from .csgtree import *
 from .geodistance import *
 from .isolines import *