From 6cf910a5e721b9acb1e07d0fb97321266de133b0 Mon Sep 17 00:00:00 2001 From: kervala Date: Wed, 1 Sep 2010 23:30:06 +0200 Subject: [PATCH] Changed: Removed propagation of dependencies to other projects (fix lintian warnings) --- code/nel/src/3d/CMakeLists.txt | 7 +++++-- code/nel/src/georges/CMakeLists.txt | 4 +++- code/nel/src/ligo/CMakeLists.txt | 2 ++ code/nel/src/logic/CMakeLists.txt | 2 ++ code/nel/src/misc/CMakeLists.txt | 2 ++ code/nel/src/net/CMakeLists.txt | 7 ++----- code/nel/src/pacs/CMakeLists.txt | 7 +++++-- code/nel/src/sound/CMakeLists.txt | 6 ++++-- 8 files changed, 25 insertions(+), 12 deletions(-) diff --git a/code/nel/src/3d/CMakeLists.txt b/code/nel/src/3d/CMakeLists.txt index 4ea6f3bae..8a33bbed0 100644 --- a/code/nel/src/3d/CMakeLists.txt +++ b/code/nel/src/3d/CMakeLists.txt @@ -664,10 +664,13 @@ SOURCE_GROUP(Shadows FILES NL_TARGET_LIB(nel3d ${SRC}) -INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${FREETYPE_INCLUDE_DIRS} ${JPEG_INCLUDE_DIR}) -TARGET_LINK_LIBRARIES(nel3d nelmisc ${FREETYPE_LIBRARY} ${JPEG_LIBRARY}) +INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${FREETYPE_INCLUDE_DIRS}) + +TARGET_LINK_LIBRARIES(nel3d nelmisc ${FREETYPE_LIBRARY}) +SET_TARGET_PROPERTIES(nel3d PROPERTIES LINK_INTERFACE_LIBRARIES "") NL_DEFAULT_PROPS(nel3d "Library: NeL 3D") NL_ADD_STATIC_VID_DRIVERS(nel3d) + NL_ADD_LIB_SUFFIX(nel3d) ADD_DEFINITIONS(${LIBXML2_DEFINITIONS}) diff --git a/code/nel/src/georges/CMakeLists.txt b/code/nel/src/georges/CMakeLists.txt index 07bdeac61..c8bba42b3 100644 --- a/code/nel/src/georges/CMakeLists.txt +++ b/code/nel/src/georges/CMakeLists.txt @@ -7,7 +7,9 @@ SOURCE_GROUP(headers FILES ${PRIV_H} ${PUB_H}) NL_TARGET_LIB(nelgeorges ${SRC}) INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR}) -TARGET_LINK_LIBRARIES(nelgeorges nelmisc) + +TARGET_LINK_LIBRARIES(nelgeorges ${LIBXML2_LIBRARIES} nelmisc) +SET_TARGET_PROPERTIES(nelgeorges PROPERTIES LINK_INTERFACE_LIBRARIES "") NL_DEFAULT_PROPS(nelgeorges "Library: NeL Georges") NL_ADD_LIB_SUFFIX(nelgeorges) diff --git a/code/nel/src/ligo/CMakeLists.txt b/code/nel/src/ligo/CMakeLists.txt index 0ee8ac180..f55667919 100644 --- a/code/nel/src/ligo/CMakeLists.txt +++ b/code/nel/src/ligo/CMakeLists.txt @@ -3,7 +3,9 @@ FILE(GLOB SRC *.cpp *.h) NL_TARGET_LIB(nelligo ${SRC}) INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR}) + TARGET_LINK_LIBRARIES(nelligo ${LIBXML2_LIBRARIES} nelmisc) +SET_TARGET_PROPERTIES(nelligo PROPERTIES LINK_INTERFACE_LIBRARIES "") NL_DEFAULT_PROPS(nelligo "Library: NeL Ligo") NL_ADD_LIB_SUFFIX(nelligo) diff --git a/code/nel/src/logic/CMakeLists.txt b/code/nel/src/logic/CMakeLists.txt index 0f01f0641..17e805ff9 100644 --- a/code/nel/src/logic/CMakeLists.txt +++ b/code/nel/src/logic/CMakeLists.txt @@ -3,7 +3,9 @@ FILE(GLOB SRC *.cpp *.h) NL_TARGET_LIB(nellogic ${SRC}) INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR}) + TARGET_LINK_LIBRARIES(nellogic ${LIBXML2_LIBRARIES} nelmisc nelnet) +SET_TARGET_PROPERTIES(nellogic PROPERTIES LINK_INTERFACE_LIBRARIES "") NL_DEFAULT_PROPS(nellogic "Library: NeL Logic") NL_ADD_LIB_SUFFIX(nellogic) diff --git a/code/nel/src/misc/CMakeLists.txt b/code/nel/src/misc/CMakeLists.txt index 63f9f4330..7d3a949a3 100644 --- a/code/nel/src/misc/CMakeLists.txt +++ b/code/nel/src/misc/CMakeLists.txt @@ -22,7 +22,9 @@ IF(WIN32) ENDIF(WIN32) INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${PNG_INCLUDE_DIR} config_file) + TARGET_LINK_LIBRARIES(nelmisc ${LIBXML2_LIBRARIES} ${PNG_LIBRARIES} ${WINSOCK2_LIB}) +SET_TARGET_PROPERTIES(nelmisc PROPERTIES LINK_INTERFACE_LIBRARIES "") NL_DEFAULT_PROPS(nelmisc "Library: NeL Misc") NL_ADD_LIB_SUFFIX(nelmisc) diff --git a/code/nel/src/net/CMakeLists.txt b/code/nel/src/net/CMakeLists.txt index fa6e35e05..a81b8a46e 100644 --- a/code/nel/src/net/CMakeLists.txt +++ b/code/nel/src/net/CMakeLists.txt @@ -11,15 +11,12 @@ IF(WITH_GTK) ENDIF(GTK2_FOUND) ENDIF(WITH_GTK) - -INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR}) -TARGET_LINK_LIBRARIES(nelnet ${LIBXML2_LIBRARIES} nelmisc) +TARGET_LINK_LIBRARIES(nelnet nelmisc) +SET_TARGET_PROPERTIES(nelnet PROPERTIES LINK_INTERFACE_LIBRARIES "") NL_DEFAULT_PROPS(nelnet "Library: NeL Net") NL_ADD_LIB_SUFFIX(nelnet) -ADD_DEFINITIONS(${LIBXML2_DEFINITIONS}) - IF(WITH_PCH) ADD_NATIVE_PRECOMPILED_HEADER(nelnet ${CMAKE_CURRENT_SOURCE_DIR}/stdnet.h ${CMAKE_CURRENT_SOURCE_DIR}/stdnet.cpp) ENDIF(WITH_PCH) diff --git a/code/nel/src/pacs/CMakeLists.txt b/code/nel/src/pacs/CMakeLists.txt index 4f1c5e48d..d98204de4 100644 --- a/code/nel/src/pacs/CMakeLists.txt +++ b/code/nel/src/pacs/CMakeLists.txt @@ -3,12 +3,15 @@ FILE(GLOB SRC *.cpp *.h) NL_TARGET_LIB(nelpacs ${SRC}) INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR}) -TARGET_LINK_LIBRARIES(nelpacs ${LIBXML2_LIBRARIES} nelmisc) + +TARGET_LINK_LIBRARIES(nelpacs nelmisc) +SET_TARGET_PROPERTIES(nelpacs PROPERTIES LINK_INTERFACE_LIBRARIES "") NL_DEFAULT_PROPS(nelpacs "Library: NeL PACS") -ADD_DEFINITIONS(${LIBXML2_DEFINITIONS}) NL_ADD_LIB_SUFFIX(nelpacs) +ADD_DEFINITIONS(${LIBXML2_DEFINITIONS}) + IF(WITH_PCH) ADD_NATIVE_PRECOMPILED_HEADER(nelpacs ${CMAKE_CURRENT_SOURCE_DIR}/stdpacs.h ${CMAKE_CURRENT_SOURCE_DIR}/stdpacs.cpp) ENDIF(WITH_PCH) diff --git a/code/nel/src/sound/CMakeLists.txt b/code/nel/src/sound/CMakeLists.txt index 1841005f6..cf32c419b 100644 --- a/code/nel/src/sound/CMakeLists.txt +++ b/code/nel/src/sound/CMakeLists.txt @@ -3,13 +3,15 @@ FILE(GLOB SRC *.cpp *.h) NL_TARGET_LIB(nelsound ${SRC}) INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR}) + TARGET_LINK_LIBRARIES(nelsound ${LIBXML2_LIBRARIES} nelmisc nelligo nelgeorges nel3d nelsnd_lowlevel) +SET_TARGET_PROPERTIES(nelsound PROPERTIES LINK_INTERFACE_LIBRARIES "") NL_DEFAULT_PROPS(nelsound "Library: NeL Sound") -ADD_DEFINITIONS(${LIBXML2_DEFINITIONS}) - NL_ADD_LIB_SUFFIX(nelsound) +ADD_DEFINITIONS(${LIBXML2_DEFINITIONS}) + IF(WITH_PCH) ADD_NATIVE_PRECOMPILED_HEADER(nelsound ${CMAKE_CURRENT_SOURCE_DIR}/stdsound.h ${CMAKE_CURRENT_SOURCE_DIR}/stdsound.cpp) ENDIF(WITH_PCH)