diff --git a/CMakeLists.txt b/CMakeLists.txt index c865032..61f5906 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -17,6 +17,9 @@ option( OFF ) +set(CMAKE_PREFIX_PATH "$ENV{MIDASSYS}") +find_package(Midas REQUIRED) + set( DRIVERS $ENV{MIDASSYS}/drivers/bus/null.cxx @@ -31,9 +34,9 @@ set(SYS_LIBS ) set(MIDAS_LIBS - $ENV{MIDASSYS}/lib/libmfe.a - $ENV{MIDASSYS}/lib/libmidas.a - $ENV{MIDASSYS}/lib/libmscb.a + midas::mfe + midas::midas + midas::mscb ) set(LIBS ${SYS_LIBS} ${MIDAS_LIBS}) @@ -59,14 +62,6 @@ target_include_directories( cfd950 PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_CURRENT_SOURCE_DIR}/device - PRIVATE - $ENV{MIDASSYS}/drivers - $ENV{MIDASSYS}/include - # This is redundant if MIDASSYS =/ Midas repo, but needed if MIDAS has been - # installed in the repo directory, since the CMake file of MIDAS doesn't - # copy the headers into $ENV{MIDASSYS}/include in the latter case. - $ENV{MIDASSYS}/include/mscb ) target_link_libraries( @@ -97,7 +92,6 @@ if(${BUILD_FRONTEND}) cfd950_fe PRIVATE $ENV{MIDASSYS}/drivers - $ENV{MIDASSYS}/include ) target_link_libraries(