From b8c45ca587c56e9a2c0ae10d9c4909b67a853bc5 Mon Sep 17 00:00:00 2001 From: kervala Date: Sun, 19 Sep 2010 18:49:03 +0200 Subject: [PATCH] Fixed: Display of .h files in generated projects --- code/nel/src/3d/CMakeLists.txt | 5 +++-- code/nel/src/cegui/CMakeLists.txt | 5 +++-- code/nel/src/georges/CMakeLists.txt | 9 ++++----- code/nel/src/ligo/CMakeLists.txt | 3 ++- code/nel/src/logic/CMakeLists.txt | 3 ++- code/nel/src/misc/CMakeLists.txt | 3 ++- code/nel/src/net/CMakeLists.txt | 5 +++-- code/nel/src/pacs/CMakeLists.txt | 3 ++- code/nel/src/sound/CMakeLists.txt | 3 ++- code/nel/src/sound/driver/CMakeLists.txt | 3 ++- 10 files changed, 25 insertions(+), 17 deletions(-) diff --git a/code/nel/src/3d/CMakeLists.txt b/code/nel/src/3d/CMakeLists.txt index 60a776fd7..09ee80fe1 100644 --- a/code/nel/src/3d/CMakeLists.txt +++ b/code/nel/src/3d/CMakeLists.txt @@ -1,4 +1,5 @@ -FILE(GLOB SRC *.cpp *.h ../../include/nel/3d/*.h) +FILE(GLOB SRC *.cpp *.h) +FILE(GLOB HEADERS ../../include/nel/3d/*.h) SOURCE_GROUP(Traversals FILES anim_detail_trav.cpp @@ -662,7 +663,7 @@ SOURCE_GROUP(Shadows FILES shadow_poly_receiver.cpp ../../include/nel/3d/shadow_poly_receiver.h) -NL_TARGET_LIB(nel3d ${SRC}) +NL_TARGET_LIB(nel3d ${HEADERS} ${SRC}) INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${FREETYPE_INCLUDE_DIRS}) diff --git a/code/nel/src/cegui/CMakeLists.txt b/code/nel/src/cegui/CMakeLists.txt index a85381022..99fcfedf3 100644 --- a/code/nel/src/cegui/CMakeLists.txt +++ b/code/nel/src/cegui/CMakeLists.txt @@ -1,6 +1,7 @@ -FILE(GLOB SRC *.cpp ../../include/nel/cegui/*.h) +FILE(GLOB SRC *.cpp *.h) +FILE(GLOB HEADERS ../../include/nel/cegui/*.h) -ADD_LIBRARY(nelceguirenderer SHARED ${SRC} nelceguirenderer.def) +ADD_LIBRARY(nelceguirenderer SHARED ${HEADERS} ${SRC} nelceguirenderer.def) INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${FREETYPE_INC} ${CEGUI_INCLUDE_DIRS}) TARGET_LINK_LIBRARIES(nelceguirenderer nelmisc nel3d ${CEGUI_LIBRARY}) diff --git a/code/nel/src/georges/CMakeLists.txt b/code/nel/src/georges/CMakeLists.txt index 42addf38d..d3c0199d7 100644 --- a/code/nel/src/georges/CMakeLists.txt +++ b/code/nel/src/georges/CMakeLists.txt @@ -1,10 +1,9 @@ -FILE(GLOB SRC *.cpp) -FILE(GLOB PRIV_H *.h) -FILE(GLOB PUB_H ../../include/nel/georges/*.h) +FILE(GLOB SRC *.cpp *.h) +FILE(GLOB HEADERS ../../include/nel/georges/*.h) -SOURCE_GROUP(headers FILES ${PRIV_H} ${PUB_H}) +# SOURCE_GROUP(headers FILES ${HEADERS}) -NL_TARGET_LIB(nelgeorges ${SRC}) +NL_TARGET_LIB(nelgeorges ${HEADERS} ${SRC}) INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR}) diff --git a/code/nel/src/ligo/CMakeLists.txt b/code/nel/src/ligo/CMakeLists.txt index 37004ab4a..f600637b7 100644 --- a/code/nel/src/ligo/CMakeLists.txt +++ b/code/nel/src/ligo/CMakeLists.txt @@ -1,6 +1,7 @@ FILE(GLOB SRC *.cpp *.h) +FILE(GLOB HEADERS ../../include/nel/ligo/*.h) -NL_TARGET_LIB(nelligo ${SRC}) +NL_TARGET_LIB(nelligo ${HEADERS} ${SRC}) INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR}) diff --git a/code/nel/src/logic/CMakeLists.txt b/code/nel/src/logic/CMakeLists.txt index d426a4948..107c57850 100644 --- a/code/nel/src/logic/CMakeLists.txt +++ b/code/nel/src/logic/CMakeLists.txt @@ -1,6 +1,7 @@ FILE(GLOB SRC *.cpp *.h) +FILE(GLOB HEADERS ../../include/nel/logic/*.h) -NL_TARGET_LIB(nellogic ${SRC}) +NL_TARGET_LIB(nellogic ${HEADERS} ${SRC}) INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR}) diff --git a/code/nel/src/misc/CMakeLists.txt b/code/nel/src/misc/CMakeLists.txt index ef7631187..74c067755 100644 --- a/code/nel/src/misc/CMakeLists.txt +++ b/code/nel/src/misc/CMakeLists.txt @@ -1,6 +1,7 @@ FILE(GLOB SRC *.cpp *.h config_file/*.cpp config_file/*.h) +FILE(GLOB HEADERS ../../include/nel/misc/*.h) -NL_TARGET_LIB(nelmisc ${SRC}) +NL_TARGET_LIB(nelmisc ${HEADERS} ${SRC}) IF(WITH_GTK) IF(GTK2_FOUND) diff --git a/code/nel/src/net/CMakeLists.txt b/code/nel/src/net/CMakeLists.txt index 65c2ab2ac..ea68efe32 100644 --- a/code/nel/src/net/CMakeLists.txt +++ b/code/nel/src/net/CMakeLists.txt @@ -1,8 +1,9 @@ -FILE(GLOB SRC "*.cpp") +FILE(GLOB SRC *.cpp *.h) +FILE(GLOB HEADERS ../../include/nel/net/*.h) FILE(GLOB NET_MANAGER "net_manager.*") LIST(REMOVE_ITEM SRC ${NET_MANAGER}) -NL_TARGET_LIB(nelnet ${SRC}) +NL_TARGET_LIB(nelnet ${HEADERS} ${SRC}) IF(WITH_GTK) IF(GTK2_FOUND) diff --git a/code/nel/src/pacs/CMakeLists.txt b/code/nel/src/pacs/CMakeLists.txt index 549a3e8dd..0fa059d68 100644 --- a/code/nel/src/pacs/CMakeLists.txt +++ b/code/nel/src/pacs/CMakeLists.txt @@ -1,6 +1,7 @@ FILE(GLOB SRC *.cpp *.h) +FILE(GLOB HEADERS ../../include/nel/pacs/*.h) -NL_TARGET_LIB(nelpacs ${SRC}) +NL_TARGET_LIB(nelpacs ${HEADERS} ${SRC}) INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR}) diff --git a/code/nel/src/sound/CMakeLists.txt b/code/nel/src/sound/CMakeLists.txt index 800a94634..9497357ee 100644 --- a/code/nel/src/sound/CMakeLists.txt +++ b/code/nel/src/sound/CMakeLists.txt @@ -1,6 +1,7 @@ FILE(GLOB SRC *.cpp *.h) +FILE(GLOB HEADERS ../../include/nel/sound/*.h) -NL_TARGET_LIB(nelsound ${SRC}) +NL_TARGET_LIB(nelsound ${HEADERS} ${SRC}) INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR}) diff --git a/code/nel/src/sound/driver/CMakeLists.txt b/code/nel/src/sound/driver/CMakeLists.txt index 8969489a8..1ace250e7 100644 --- a/code/nel/src/sound/driver/CMakeLists.txt +++ b/code/nel/src/sound/driver/CMakeLists.txt @@ -1,6 +1,7 @@ FILE(GLOB SRC *.cpp *.h) +FILE(GLOB HEADERS ../../../include/nel/sound/driver/*.h) -NL_TARGET_LIB(nelsnd_lowlevel ${SRC}) +NL_TARGET_LIB(nelsnd_lowlevel ${HEADERS} ${SRC}) IF(WITH_STATIC) # Add libogg dependency only if target is static because to libvorbisfile