* All tools:
- Library linking: there must not be "target_link_library()" for libraries, only when building binaries. Avoid clashes between static module or class variables, and strange reinitialisation of those variables. - Change: Boost is now always linked staticly.
This commit is contained in:
parent
1e1c921897
commit
b80c3508d6
|
@ -37,14 +37,6 @@
|
||||||
qt4_wrap_cpp ( mocCpps ${mocIncludes} )
|
qt4_wrap_cpp ( mocCpps ${mocIncludes} )
|
||||||
|
|
||||||
add_library ( solstice ${cpps} ${mocCpps} )
|
add_library ( solstice ${cpps} ${mocCpps} )
|
||||||
target_link_libraries ( solstice ${EQUINOX_LIBRARIES}
|
|
||||||
${CORIOLIS_LIBRARIES}
|
|
||||||
${HURRICANE_LIBRARIES}
|
|
||||||
${HURRICANE_GRAPHICAL_LIBRARIES}
|
|
||||||
${QT_LIBRARIES}
|
|
||||||
${LEFDEF_LIBRARIES}
|
|
||||||
${OA_LIBRARIES}
|
|
||||||
)
|
|
||||||
install ( TARGETS solstice DESTINATION lib${LIB_SUFFIX} )
|
install ( TARGETS solstice DESTINATION lib${LIB_SUFFIX} )
|
||||||
install ( FILES ${includes}
|
install ( FILES ${includes}
|
||||||
${mocIncludes} DESTINATION include/coriolis2/solstice )
|
${mocIncludes} DESTINATION include/coriolis2/solstice )
|
||||||
|
|
Loading…
Reference in New Issue