Made installation more robust - MIDASSYS does not need to be the MIDAS repo anymore
This commit is contained in:
@@ -0,0 +1 @@
|
||||
build
|
||||
+20
-10
@@ -29,17 +29,23 @@ set(
|
||||
$ENV{MIDASSYS}/drivers/class/multi.cxx
|
||||
)
|
||||
|
||||
set(
|
||||
LIBS
|
||||
# -lz # compression library
|
||||
-lpthread
|
||||
-lutil
|
||||
-lrt # librt for real time guarantees (really just backwards compat)
|
||||
-ldl # libdl for dynamic loading
|
||||
$ENV{MIDASSYS}/lib/libmfe.a
|
||||
$ENV{MIDASSYS}/lib/libmidas.a
|
||||
set(SYS_LIBS
|
||||
pthread
|
||||
util
|
||||
rt
|
||||
dl
|
||||
)
|
||||
|
||||
link_directories($ENV{MIDASSYS}/lib)
|
||||
# Links to libmfe.a and libmidas.a
|
||||
set(MIDAS_LIBS
|
||||
mfe
|
||||
midas
|
||||
mscb
|
||||
)
|
||||
|
||||
set(LIBS ${SYS_LIBS} ${MIDAS_LIBS})
|
||||
|
||||
################################################################################
|
||||
## make tcpip library configurable
|
||||
################################################################################
|
||||
@@ -88,7 +94,11 @@ target_include_directories(
|
||||
PRIVATE
|
||||
$ENV{MIDASSYS}/drivers
|
||||
$ENV{MIDASSYS}/include
|
||||
$ENV{MIDASSYS}/mscb/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(
|
||||
|
||||
Reference in New Issue
Block a user