christoph/fail
1
Fork 0
Code Releases Activity

prefix internal libraries to avoid naming conflicts with system libraries

Browse Source 
This is a precaution to avoid current and future naming conflicts with
common system libraries.  libutil (part of libc) is the first, but probably
not the last example that already caused trouble twice.

git-svn-id: https://www4.informatik.uni-erlangen.de/i4svn/danceos/trunk/devel/fail@1614 8c4709b5-6ec9-48aa-a5cd-a96041d1645a
This commit is contained in:
hsc
2012-09-12 07:52:30 +00:00
parent 5dc0b5a343
commit f9c96ddf2d
26 changed files with 52 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
simulators/ovp/cortexM3/CMakeLists.txt
View File

@ -7,9 +7,9 @@ set(SRCS
)
add_executable(ovp_cortexM3 ${SRCS})
add_dependencies(ovp_cortexM3 ovpstatusmessages )
add_dependencies(ovp_cortexM3 fail-ovpstatusmessages )
target_link_libraries(ovp_cortexM3 ${SIM_LDFLAGS} sal cpn comm efw util ovpstatusmessages)
target_link_libraries(ovp_cortexM3 ${SIM_LDFLAGS} fail fail-ovpstatusmessages)
## OVP links all needed shared libraries via a runtimeloader
set_target_properties(ovp_cortexM3 PROPERTIES LINK_FLAGS "-L${CMAKE_BINARY_DIR}/lib -lpcl -lprotobuf -m32 ")

9
simulators/ovp/ovpworld.org/mmc/flakyMemory/1.0/model/CMakeLists.txt
View File

@ -4,10 +4,9 @@ set(SRCS
)
add_definitions("-m32")
message(STATUS "flaky ld flags: ${HOST_LDFLAGS}")
add_library(flaky SHARED ${SRCS})
add_library(fail-flaky SHARED ${SRCS})
add_dependencies(flaky msg sal)
set_target_properties(flaky PROPERTIES LINK_FLAGS "${HOST_LDFLAGS} -m32")
target_link_libraries(flaky ${IMPERAS_VMISTUBS} ${LIBRARY_OUTPUT_PATH}/libsal.a)
add_dependencies(fail-flaky fail-comm fail-sal)
set_target_properties(fail-flaky PROPERTIES LINK_FLAGS "${HOST_LDFLAGS} -m32")
target_link_libraries(fail-flaky ${IMPERAS_VMISTUBS} ${LIBRARY_OUTPUT_PATH}/libsal.a)

3
simulators/ovp/statusmsg/CMakeLists.txt
View File

@ -11,5 +11,4 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR})
PROTOBUF_GENERATE_CPP(PROTO_SRCS PROTO_HDRS ${MY_PROTOS} )
## Build library
add_library(ovpstatusmessages ${PROTO_SRCS} ${PROTO_HDRS} )
add_library(fail-ovpstatusmessages ${PROTO_SRCS} ${PROTO_HDRS} )

2
simulators/ovp/test1/CMakeLists.txt
View File

@ -7,7 +7,7 @@ set(SRCS
platform/platform.cpp
)
add_executable(ovp ${SRCS})
add_dependencies(ovp msg)
add_dependencies(ovp fail-comm)
target_link_libraries(ovp ${SIM_LDFLAGS} )
## OVP links all needed shared libraries via a runtimeloader
set_target_properties(ovp PROPERTIES LINK_FLAGS " -m32 ")