Commit a55e9b99 authored by Simon Spannagel's avatar Simon Spannagel
Browse files

Merge branch 'eigen_tidy' into 'master' 

CMake: Include Eigen3 at Top Level

Closes #225

See merge request allpix-squared/allpix-squared!656
parents ae56949b 1b0d6545

CMakeLists.txt

+11 −0
Original line number Diff line number Diff line
@@ -158,6 +158,9 @@ IF(NOT APPLE AND NOT CMAKE_LINK_WHAT_YOU_USE) 
        CACHE STRING "Choose whether to only link libraries which contain symbols actually used by the target." FORCE)

ENDIF()



# We need PkgConfig for some dependencies:

FIND_PACKAGE(PkgConfig REQUIRED)



###################################

# Define build flags for allpix   #

###################################
@@ -256,6 +259,9 @@ FIND_PACKAGE(Threads REQUIRED) 
# Include Boost.Random

FIND_PACKAGE(Boost 1.64.0 REQUIRED COMPONENTS random)



# Include Eigen3 without requiring it at this moment

PKG_CHECK_MODULES(Eigen3 QUIET IMPORTED_TARGET eigen3)



#####################################

# Prerequisistes for Allpix Squared #

#####################################
@@ -306,6 +312,11 @@ SET(ALLPIX_DEPS_LIBRARIES 
    ROOT::RIO

    ROOT::Hist)



# If Eigen3 has been found, link it:

IF(Eigen3_FOUND)

    LIST(APPEND ALLPIX_DEPS_LIBRARIES PkgConfig::Eigen3)

ENDIF()



# Add the LCG view as dependency if set:

IF(DEFINED ENV{LCG_VIEW})

    ADD_RUNTIME_DEP($ENV{LCG_VIEW})

src/modules/CapacitiveTransfer/CMakeLists.txt

+0 −1
Original line number Diff line number Diff line
@@ -5,7 +5,6 @@ ALLPIX_DETECTOR_MODULE(MODULE_NAME) 
ALLPIX_MODULE_SOURCES(${MODULE_NAME} CapacitiveTransferModule.cpp)



# Eigen is required for finding the coupling distances

FIND_PACKAGE(PkgConfig REQUIRED)

PKG_CHECK_MODULES(Eigen3 REQUIRED IMPORTED_TARGET eigen3)



TARGET_LINK_LIBRARIES(${MODULE_NAME} PkgConfig::Eigen3)

src/modules/DatabaseWriter/CMakeLists.txt

+1 −2
Original line number Diff line number Diff line 
ALLPIX_ENABLE_DEFAULT(OFF)

ALLPIX_UNIQUE_MODULE(MODULE_NAME)



find_package(PkgConfig REQUIRED)

pkg_check_modules(PQXX REQUIRED libpqxx)

PKG_CHECK_MODULES(PQXX REQUIRED libpqxx)



TARGET_LINK_LIBRARIES(${MODULE_NAME} ${PQXX_LIBRARIES})

TARGET_INCLUDE_DIRECTORIES(${MODULE_NAME} SYSTEM PRIVATE ${PQXX_INCLUDE_DIRS})

src/modules/GenericPropagation/CMakeLists.txt

+0 −1
Original line number Diff line number Diff line
@@ -8,7 +8,6 @@ ALLPIX_MODULE_SOURCES(${MODULE_NAME} GenericPropagationModule.cpp) 
ALLPIX_MODULE_TESTS(${MODULE_NAME} "tests")



# Eigen is required for Runge-Kutta propagation

FIND_PACKAGE(PkgConfig REQUIRED)

PKG_CHECK_MODULES(Eigen3 REQUIRED IMPORTED_TARGET eigen3)



TARGET_LINK_LIBRARIES(${MODULE_NAME} ROOT::Graf3d PkgConfig::Eigen3)

src/modules/TransientPropagation/CMakeLists.txt

+0 −1
Original line number Diff line number Diff line
@@ -5,7 +5,6 @@ ALLPIX_DETECTOR_MODULE(MODULE_NAME) 
ALLPIX_MODULE_SOURCES(${MODULE_NAME} TransientPropagationModule.cpp)



# Eigen is required for Runge-Kutta propagation

FIND_PACKAGE(PkgConfig REQUIRED)

PKG_CHECK_MODULES(Eigen3 REQUIRED IMPORTED_TARGET eigen3)



TARGET_LINK_LIBRARIES(${MODULE_NAME} PkgConfig::Eigen3)