FailBochs build process reversed
The FailBochs client is not linked by the Bochs build system anymore, but
by our cmake scripts (make fail-client):
- All Bochs libraries are merged into libfailbochs.a (a new target
within the Bochs Autotools scripts).
- The previous libfail.a is *not* a merge of all Fail* libraries anymore,
but pulls these in via library dependencies.
Additionally I did a lot of build system cleanup, e.g. additional external
libraries may now be pulled in where they're needed.
git-svn-id: https://www4.informatik.uni-erlangen.de/i4svn/danceos/trunk/devel/fail@1390 8c4709b5-6ec9-48aa-a5cd-a96041d1645a
This commit is contained in:
@ -1,10 +1,24 @@
|
||||
set(SRCS
|
||||
SynchronizedCounter.cc
|
||||
Logger.hpp
|
||||
Logger.cc
|
||||
Logger.hpp
|
||||
MemoryMap.hpp
|
||||
ProtoStream.cc
|
||||
ProtoStream.hpp
|
||||
SynchronizedCounter.cc
|
||||
SynchronizedCounter.hpp
|
||||
SynchronizedMap.hpp
|
||||
SynchronizedQueue.hpp
|
||||
)
|
||||
|
||||
add_library(util ${SRCS})
|
||||
# required by ProtoStream.cc:
|
||||
find_package(Protobuf REQUIRED)
|
||||
include_directories(${PROTOBUF_INCLUDE_DIRS})
|
||||
include_directories(${CMAKE_CURRENT_BINARY_DIR})
|
||||
|
||||
# FIXME: Add protobuf-dependency (required by ProtoStream.cc@line56)
|
||||
# required by Synchronized*.cc:
|
||||
find_package(Boost 1.42 COMPONENTS thread REQUIRED)
|
||||
include_directories(${Boost_INCLUDE_DIRS})
|
||||
link_directories(${Boost_LIBRARY_DIRS})
|
||||
|
||||
add_library(util ${SRCS})
|
||||
target_link_libraries(util ${PROTOBUF_LIBRARY} ${Boost_THREAD_LIBRARY})
|
||||
|
||||
Reference in New Issue
Block a user