CMakeLists.txt

@@ -7,7 +7,7 @@ project(elsa VERSION 0.5
 
 # ------------ elsa options ------------
 # ------------
-# detect if elsa is being bundled, disable install and tests
+# detect if elsa is being bundled, disable some options based on this
 if (NOT DEFINED ELSA_MASTER_PROJECT)
     if (CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_SOURCE_DIR)
         set(ELSA_MASTER_PROJECT ON)
@@ -16,13 +16,14 @@ if (NOT DEFINED ELSA_MASTER_PROJECT)
     endif()
 endif ()
 
-option(ELSA_TESTING "Enable the unit tests of elsa" ON)
+option(ELSA_TESTING "Enable the unit tests of elsa" ${ELSA_MASTER_PROJECT})
 option(ELSA_INSTALL "Generate the install target" ${ELSA_MASTER_PROJECT})
 option(GIT_SUBMODULE "Check submodules during build" ${ELSA_MASTER_PROJECT})
 option(ELSA_BUILD_EXAMPLES "Build examples" ${ELSA_MASTER_PROJECT})
 
 option(ELSA_BUILD_CUDA_PROJECTORS "Attempts to build CUDA projectors if set" ON)
 option(ELSA_BUILD_WITH_MORE_WARNINGS "Reduce noise of warnings, but make chaning fast and easy" OFF)
+option(ELSA_BUILD_WITH_SANITIZERS "Build with Sanitizers. Pass ELSA_SANITIZE_THREAD or ELSA_SANITIZE_ADDRESS" ON)
 
 # ------------ general setup -----------
 # ------------
@@ -30,7 +31,7 @@ option(ELSA_BUILD_WITH_MORE_WARNINGS "Reduce noise of warnings, but make chaning
 # add our cmake modules under cmake/
 set(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake" ${CMAKE_MODULE_PATH})
 
-# set default built type to "Debug" (if no other specified)
+# set default built type to "Release" (if no other specified)
 set(DEFAULT_BUILD_TYPE "Release")
 include(SetDefaultBuildType)
 
@@ -74,6 +75,7 @@ if(ELSA_TESTING)
 
     enable_testing()
     add_subdirectory(thirdparty/Catch2)
+
     # add the CMake modules for automatic test discovery
     set(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/thirdparty/Catch2/contrib" ${CMAKE_MODULE_PATH})
 else(ELSA_TESTING)

cmake/Sanitizers.cmake

+
+if(ELSA_SANITIZE_THREAD AND ELSA_SANITIZE_ADDRESS)
+    message(FATAL_ERROR "AddressSanitizer is not compatible with ThreadSanitizer.")
+endif()
+
+if(ELSA_SANITIZE_ADDRESS)
+    message(STATUS "AddressSanitizer enabled")
+    set(SANITIZER_FLAGS "-fsanitize=address,undefined")
+    add_compile_options("-fno-sanitize=signed-integer-overflow")
+endif()
+
+if(ELSA_SANITIZE_THREAD)
+    message(STATUS "ThreadSanitizer enabled")
+    set(SANITIZER_FLAGS "-fsanitize=thread")
+endif()
+
+if(ELSA_SANITIZE_THREAD OR ELSA_SANITIZE_ADDRESS)
+    add_compile_options(${SANITIZER_FLAGS})
+    add_compile_options("-fno-sanitize-recover=all")
+    add_compile_options("-fno-omit-frame-pointer")
+    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${SANITIZER_FLAGS} -fuse-ld=gold")
+endif()

cmake/elsaConfig.cmake.in

 @PACKAGE_INIT@
 
-include(CmakeFindDependencyMacro)
+include(CMakeFindDependencyMacro)
 find_dependency(Eigen3 3.3 NO_MODULE REQUIRED)
 
 

elsa/CMakeLists.txt

@@ -24,18 +24,24 @@ add_subdirectory(generators)
 #---------------------------------------------------------------------------------------
 # Turn on compiler warnings and sanitizers for all components on, if wanted
 #---------------------------------------------------------------------------------------
-if(${ELSA_MASTER_PROJECT} AND ${ELSA_BUILD_WITH_MORE_WARNINGS})
+if(${ELSA_MASTER_PROJECT})
     foreach (_component ${ELSA_REGISTERED_COMPONENTS})
-        if (CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang|AppleClang")
-            target_compile_options( elsa_${_component} PUBLIC -Wall -Wextra -Wconversion -pedantic -Wfatal-errors)
-        endif()
-        if (CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
-            target_compile_options( elsa_${_component} PUBLIC /W3 /WX )
-        endif()
-
-        #include(cmake/sanitizers.cmake)
+        # add warnings if enabled
+        if(${ELSA_BUILD_WITH_MORE_WARNINGS})
+            if (CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang|AppleClang")
+                target_compile_options( elsa_${_component} PUBLIC -Wall -Wextra -Wconversion -pedantic -Wfatal-errors)
+            endif()
+            if (CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
+                target_compile_options( elsa_${_component} PUBLIC /W3 /WX )
+            endif()
+        endif(${ELSA_BUILD_WITH_MORE_WARNINGS})
     endforeach (_component ELSA_REGISTERED_COMPONENTS)
-endif(${ELSA_MASTER_PROJECT} AND ${ELSA_BUILD_WITH_MORE_WARNINGS})
+
+    # add sanitizers if enabled
+    if(${ELSA_BUILD_WITH_SANITIZERS})
+        include(${PROJECT_SOURCE_DIR}/cmake/Sanitizers.cmake)
+    endif(${ELSA_BUILD_WITH_SANITIZERS})
+endif(${ELSA_MASTER_PROJECT})
 
 # propogate the variable to the parent scope
 set(ELSA_REGISTERED_COMPONENTS "${ELSA_REGISTERED_COMPONENTS};" PARENT_SCOPE)

elsa/core/CMakeLists.txt

@@ -41,7 +41,8 @@ target_link_libraries(${ELSA_MODULE_TARGET_NAME} PUBLIC Eigen3::Eigen)
 
 # require C++17
 target_compile_features(${ELSA_MODULE_TARGET_NAME} PUBLIC cxx_std_17)
-
+# set -fPIC
+set_target_properties(${ELSA_MODULE_TARGET_NAME} PROPERTIES POSITION_INDEPENDENT_CODE ON)
 
 # build the tests (if enabled)
 if(ELSA_TESTING)

elsa/functionals/CMakeLists.txt

@@ -52,6 +52,8 @@ target_include_directories(${ELSA_MODULE_TARGET_NAME}
 
 # require C++17
 target_compile_features(${ELSA_MODULE_TARGET_NAME} PUBLIC cxx_std_17)
+# set -fPIC
+set_target_properties(${ELSA_MODULE_TARGET_NAME} PROPERTIES POSITION_INDEPENDENT_CODE ON)
 
 
 # build the tests (if enabled)

elsa/generators/CMakeLists.txt

@@ -34,6 +34,8 @@ target_include_directories(${ELSA_MODULE_TARGET_NAME}
 
 # require C++17
 target_compile_features(${ELSA_MODULE_TARGET_NAME} PUBLIC cxx_std_17)
+# set -fPIC
+set_target_properties(${ELSA_MODULE_TARGET_NAME} PROPERTIES POSITION_INDEPENDENT_CODE ON)
 
 
 # build the tests (if enabled)

elsa/io/CMakeLists.txt

@@ -34,6 +34,8 @@ target_include_directories(${ELSA_MODULE_TARGET_NAME}
 
 # require C++17
 target_compile_features(${ELSA_MODULE_TARGET_NAME} PUBLIC cxx_std_17)
+# set -fPIC
+set_target_properties(${ELSA_MODULE_TARGET_NAME} PROPERTIES POSITION_INDEPENDENT_CODE ON)
 
 
 # build the tests (if enabled)

elsa/logging/CMakeLists.txt

@@ -33,6 +33,8 @@ target_link_libraries(${ELSA_MODULE_TARGET_NAME} PUBLIC spdlog::spdlog_header_on
 
 # require C++17
 target_compile_features(${ELSA_MODULE_TARGET_NAME} PUBLIC cxx_std_17)
+# set -fPIC
+set_target_properties(${ELSA_MODULE_TARGET_NAME} PROPERTIES POSITION_INDEPENDENT_CODE ON)
 
 
 # build the tests (if enabled)

elsa/operators/CMakeLists.txt

@@ -41,6 +41,8 @@ target_include_directories(${ELSA_MODULE_TARGET_NAME}
 
 # require C++17
 target_compile_features(${ELSA_MODULE_TARGET_NAME} PUBLIC cxx_std_17)
+# set -fPIC
+set_target_properties(${ELSA_MODULE_TARGET_NAME} PROPERTIES POSITION_INDEPENDENT_CODE ON)
 
 
 # build the tests (if enabled)

elsa/problems/CMakeLists.txt

@@ -36,6 +36,8 @@ target_include_directories(${ELSA_MODULE_TARGET_NAME}
 
 # require C++17
 target_compile_features(${ELSA_MODULE_TARGET_NAME} PUBLIC cxx_std_17)
+# set -fPIC
+set_target_properties(${ELSA_MODULE_TARGET_NAME} PROPERTIES POSITION_INDEPENDENT_CODE ON)
 
 
 # build the tests (if enabled)

elsa/projectors/CMakeLists.txt

@@ -42,7 +42,6 @@ if(OpenMP_CXX_FOUND)
 endif()
 
 
-
 target_include_directories(${ELSA_MODULE_TARGET_NAME}
         PUBLIC
         $<INSTALL_INTERFACE:include/${ELSA_MODULE_NAME}>
@@ -52,6 +51,8 @@ target_include_directories(${ELSA_MODULE_TARGET_NAME}
 
 # require C++17
 target_compile_features(${ELSA_MODULE_TARGET_NAME} PUBLIC cxx_std_17)
+# set -fPIC
+set_target_properties(${ELSA_MODULE_TARGET_NAME} PROPERTIES POSITION_INDEPENDENT_CODE ON)
 
 
 # build the tests (if enabled)

elsa/projectors_cuda/CMakeLists.txt

@@ -45,6 +45,8 @@ if (CMAKE_CUDA_COMPILER)
 
     # require C++17
     target_compile_features(${ELSA_MODULE_TARGET_NAME} PUBLIC cxx_std_17) 
+    # set -fPIC
+    set_target_properties(${ELSA_MODULE_TARGET_NAME} PROPERTIES POSITION_INDEPENDENT_CODE ON)
 
 
     # build the tests (if enabled)

elsa/solvers/CMakeLists.txt

@@ -32,6 +32,8 @@ target_include_directories(${ELSA_MODULE_TARGET_NAME}
 
 # require C++17
 target_compile_features(${ELSA_MODULE_TARGET_NAME} PUBLIC cxx_std_17)
+# set -fPIC
+set_target_properties(${ELSA_MODULE_TARGET_NAME} PROPERTIES POSITION_INDEPENDENT_CODE ON)
 
 
 # build the tests (if enabled)