Split C++ code in 2 separate shared libraries

.travis.yml

@@ -82,6 +82,7 @@ script:
       --warn-uninitialized \
       -DUSE_CLANG_TIDY:BOOL=ON \
       -DBasalt_CXX_OPTIMIZE:BOOL=$CXX_OPTIMIZE \
+      -DPYTHON_EXECUTABLE:FILEPATH=`which python3` \
       -DCMAKE_CXX_STANDARD=$CPP \
   - make VERBOSE=1 -j2
   - ctest -j2 --output-on-failure

CMakeLists.txt

@@ -7,7 +7,6 @@ include(cmake/bob.cmake)
 bob_begin_package()
 
 bob_option(Basalt_USE_pybind11 "Build Python bindings" OFF)
-bob_option(Basalt_BUILD_PYTHON_PACKAGE "Build Python package" OFF)
 bob_option(USE_CLANG_TIDY "Perform C++ static analysis while compiling" OFF)
 
 set(Basalt_SERIALIZATION_METHODS CEREAL SSTREAM)
@@ -81,9 +80,13 @@ set(spdlog_include_directory
 if(USE_CLANG_TIDY)
   cmake_minimum_required(VERSION 3.8)
   find_package(ClangTidy REQUIRED)
-  set(CLANG_TIDY_ARGS "-extra-arg=-Wno-unknown-warning-option"
+  set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
+  set(CLANG_TIDY_ARGS -extra-arg=-Wno-unknown-warning-option
       CACHE STRING "clang-tidy command options")
-  set(CMAKE_CXX_CLANG_TIDY "${ClangTidy_EXECUTABLE}" ${CLANG_TIDY_ARGS})
+  set(CMAKE_CXX_CLANG_TIDY
+      "${ClangTidy_EXECUTABLE}"
+      -p "${CMAKE_BINARY_DIR}/compile_commands.json"
+      ${CLANG_TIDY_ARGS})
 endif()
 add_subdirectory(src)
 if(NOT Basalt_BUILD_PYTHON_PACKAGE)

basalt/__init__.py

@@ -1,4 +1,5 @@
 from enum import Enum
+
 from _basalt import *
 from _basalt import __version__, __rocksdb_version__
 

setup.py

@@ -42,11 +42,10 @@ def build_extension(self, ext):
             '-DPYTHON_EXECUTABLE=' + sys.executable,
             '-DBasalt_USE_pybind11:BOOL=True',
             '-DCMAKE_BUILD_TYPE=',
-            '-DBasalt_BUILD_PYTHON_PACKAGE:BOOL=TRUE',
         ]
 
         optimize = 'ON' if self.debug else 'OFF'
-        build_args = ['--config', optimize]
+        build_args = ['--config', optimize, '--target', '_basalt']
 
         if platform.system() == "Windows":
             cmake_args += [

src/CMakeLists.txt

@@ -1,3 +1,4 @@
+# pure C++ shared library
 set(basalt_SOURCES
     basalt/connections.cpp
     basalt/graph.hpp
@@ -28,33 +29,26 @@ include_directories(${cereal_include_directory}
                     ${CMAKE_CURRENT_SOURCE_DIR}/basalt
                     ${CMAKE_CURRENT_BINARY_DIR})
 
+add_library(basalt_obj OBJECT ${basalt_SOURCES} ${basalt_HEADERS})
+set_property(TARGET basalt_obj PROPERTY POSITION_INDEPENDENT_CODE ON)
+
+# Shared library
+add_library(basalt SHARED $<TARGET_OBJECTS:basalt_obj>)
+target_link_libraries(basalt ${RocksDB_LIBRARIES})
+bob_library_includes(basalt)
+bob_export_target(basalt)
+install(FILES ${basalt_HEADERS} DESTINATION include)
+
+# Shared library with Python bindings
 set(PYBIND11_SOURCES
     basalt/circuit_payloads.hpp
     basalt/circuit_payloads.cpp
     basalt/py_basalt.cpp
     basalt/py_helpers.hpp)
 set(PYBIND11_CPP_STANDARD -std=c++11)
-
-if(Basalt_BUILD_PYTHON_PACKAGE)
-  add_subdirectory(${pybind11_project_directory})
-  pybind11_add_module(_basalt
-                      ${PYBIND11_SOURCES}
-                      ${basalt_SOURCES}
-                      ${basalt_HEADERS})
-  target_link_libraries(_basalt PRIVATE ${RocksDB_LIBRARIES})
-else()
-  add_library(basalt ${basalt_SOURCES} ${basalt_HEADERS})
-  bob_library_includes(basalt)
-  bob_export_target(basalt)
-  target_link_libraries(basalt ${RocksDB_LIBRARIES})
-  install(FILES ${basalt_HEADERS} DESTINATION include)
-
-  if(Basalt_USE_pybind11)
-    add_subdirectory(third_party/pybind11)
-    pybind11_add_module(pybasalt
-                        ${PYBIND11_SOURCES}
-                        ${basalt_SOURCES}
-                        ${basalt_HEADERS})
-    target_link_libraries(pybasalt PRIVATE ${RocksDB_LIBRARIES})
-  endif()
-endif()
+add_subdirectory(${pybind11_project_directory})
+pybind11_add_module(_basalt
+                    SHARED
+                    ${PYBIND11_SOURCES}
+                    $<TARGET_OBJECTS:basalt_obj>)
+target_link_libraries(_basalt PRIVATE ${RocksDB_LIBRARIES})

tests/unit/CMakeLists.txt

@@ -1,6 +1,6 @@
 include_directories(${catch2_include_directory} ${cereal_include_directory})
 
 add_executable(unit-tests 101.cpp)
-target_link_libraries(unit-tests PRIVATE basalt)
+target_link_libraries(unit-tests PRIVATE _basalt ${PYTHON_LIBRARIES})
 
 add_test(NAME unit-tests COMMAND $<TARGET_FILE:unit-tests>)