Index: CMakeLists.txt =================================================================== RCS file: /sources/certi/certi/libRTI/CMakeLists.txt,v retrieving revision 1.23 diff -u -r1.23 CMakeLists.txt --- CMakeLists.txt 16 Sep 2011 16:39:04 -0000 1.23 +++ CMakeLists.txt 28 Sep 2011 13:31:57 -0000 @@ -1,5 +1,41 @@ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/libCERTI) +########################################################## +# VariableLenghtData +################################# +SET(VARDATA1516_SRCS + RTI1516variableLengthData.cpp + RTI1516variableLengthDataImplementation.h + ../include/RTI/VariableLengthData.h +) + +SOURCE_GROUP("Source Files\\VarData" FILES ${VARDATA1516_SRCS}) + +ADD_LIBRARY(VarData1516 STATIC + ${VARDATA1516_SRCS} +) + +# Correct line +TARGET_LINK_LIBRARIES(VarData1516) +# Incorrect line +#TARGET_LINK_LIBRARIES(FedTime1516 RTI1516) + +SET_TARGET_PROPERTIES(VarData1516 PROPERTIES PROJECT_LABEL LibVarData1516) +SET_TARGET_PROPERTIES(VarData1516 PROPERTIES COMPILE_FLAGS "-DRTI_DISABLE_WARNINGS -DSTATIC_RTI") + +IF (MINGW) + SET_TARGET_PROPERTIES(VarData1516 PROPERTIES LINK_FLAGS "-Wl,--output-def,${LIBRARY_OUTPUT_PATH}/libVarData1516.def") + INSTALL(FILES ${LIBRARY_OUTPUT_PATH}/libVarData1516.def + DESTINATION lib) +ENDIF (MINGW) + +SET_TARGET_PROPERTIES(VarData1516 PROPERTIES VERSION 1.0.0 SOVERSION 1) + +########################## +# RTI1516 +########################## + + SET(RTI1516_LIB_SRCS RTI1516ambassadorFactory.cpp RTI1516exception.cpp @@ -173,14 +209,14 @@ ) # Correct line -TARGET_LINK_LIBRARIES(FedTime1516) +TARGET_LINK_LIBRARIES(FedTime1516 VarData1516) # Incorrect line # (at least the dependency exists but we cannot specify that # because we would generate a circular deps RTI1516-->FedTime1516-->RTI1516) #TARGET_LINK_LIBRARIES(FedTime1516 RTI1516) SET_TARGET_PROPERTIES(FedTime1516 PROPERTIES PROJECT_LABEL LibFedTime1516) -SET_TARGET_PROPERTIES(FedTime1516 PROPERTIES COMPILE_FLAGS "-DBUILDING_FEDTIME -DRTI_DISABLE_WARNINGS") +SET_TARGET_PROPERTIES(FedTime1516 PROPERTIES COMPILE_FLAGS "-DBUILDING_FEDTIME -DRTI_DISABLE_WARNINGS -DSTATIC_RTI") IF (MINGW) SET_TARGET_PROPERTIES(FedTime1516 PROPERTIES LINK_FLAGS "-Wl,--output-def,${LIBRARY_OUTPUT_PATH}/libFedTime1516.def") @@ -203,7 +239,7 @@ # Install rules for both libRTI-NG and libFedTime -INSTALL(TARGETS RTI FedTime RTI1516 FedTime1516 +INSTALL(TARGETS RTI FedTime RTI1516 FedTime1516 VarData1516 EXPORT certi-targets RUNTIME DESTINATION bin LIBRARY DESTINATION lib