Khaganat-NeL/khanat-opennel-code
1
0
Fork 0
Code Issues 21 Pull requests Packages Projects Releases 1 Wiki Activity

Changed: Removed propagation of dependencies to other projects (fix lintian warnings)

Browse source
This commit is contained in:
kervala 2010-09-02 09:56:54 +02:00
parent 2c8bee2174
commit 4eae9d7739
4 changed files with 18 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
code/nel/samples/3d/cegui/CMakeLists.txt
View file

@ -5,6 +5,7 @@ ADD_EXECUTABLE(nl_sample_cegui WIN32 ${SRC})
ADD_DEFINITIONS(-DCEGUI_DATA_DIR="\\"${NL_SHARE_PREFIX}/nl_sample_cegui/datafiles/\\"")
INCLUDE_DIRECTORIES(${CEGUI_INCLUDE_DIRS})
TARGET_LINK_LIBRARIES(nl_sample_cegui ${CEGUI_LIBRARY} ${PLATFORM_LINKFLAGS} nelmisc nel3d)
NL_DEFAULT_PROPS(nl_sample_cegui "Samples, 3D: NeL CEGUI Demo")
NL_ADD_RUNTIME_FLAGS(nl_sample_cegui)

9
code/nel/src/sound/driver/CMakeLists.txt
View file

@ -1,12 +1,15 @@
FILE(GLOB SRC *.cpp *.h)
nl_target_lib(nelsnd_lowlevel ${SRC})
NL_TARGET_LIB(nelsnd_lowlevel ${SRC})
INCLUDE_DIRECTORIES(${OGG_INCLUDE_DIR} ${VORBIS_INCLUDE_DIR})
TARGET_LINK_LIBRARIES(nelsnd_lowlevel nelmisc ${VORBIS_LIBRARY} ${VORBISFILE_LIBRARY} ${OGG_LIBRARY})
nl_default_props(nelsnd_lowlevel "Library: NeL Sound Lowlevel")
SET_TARGET_PROPERTIES(nelsnd_lowlevel PROPERTIES LINK_INTERFACE_LIBRARIES "")
NL_DEFAULT_PROPS(nelsnd_lowlevel "Library: NeL Sound Lowlevel")
NL_ADD_STATIC_VID_DRIVERS(nelsnd_lowlevel)
nl_add_lib_suffix(nelsnd_lowlevel)
NL_ADD_LIB_SUFFIX(nelsnd_lowlevel)
IF(WITH_PCH)
ADD_NATIVE_PRECOMPILED_HEADER(nelsnd_lowlevel ${CMAKE_CURRENT_SOURCE_DIR}/stdsound_lowlevel.h ${CMAKE_CURRENT_SOURCE_DIR}/stdsound_lowlevel.cpp)

14
code/nelns/login_system/nel_launcher_windows_ext2/CMakeLists.txt
View file

@ -1,20 +1,16 @@
FILE(GLOB SRC *.cpp *.h)
DECORATE_NEL_LIB("nel3d")
SET(NL3D_LIB ${LIBNAME})
ADD_EXECUTABLE(nel_launcher_ext2 WIN32 ${SRC} nel_launcher.rc)
IF(CURL_FOUND)
ADD_DEFINITIONS(-DUSE_CURL)
ENDIF(CURL_FOUND)
ADD_DEFINITIONS(-DNL_LAUNCHER_CFG="\\"${NL_ETC_PREFIX}/\\"")
INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${NELMISC_INCLUDE_DIRS})
TARGET_LINK_LIBRARIES(nel_launcher_ext2 ${LIBXML2_LIBRARIES} ${PLATFORM_LINKFLAGS} ${NELNET_LIBRARY} ${NELMISC_LIBRARY} ${ZLIB_LIBRARY} ${CURL_LIBRARY})
SET_TARGET_PROPERTIES(nel_launcher_ext2 PROPERTIES
LINK_FLAGS "/NODEFAULTLIB:libcmt"
PROJECT_LABEL "Launcher: NeL Launcher Ext2")
ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
INCLUDE_DIRECTORIES(${NELMISC_INCLUDE_DIRS})
TARGET_LINK_LIBRARIES(nel_launcher_ext2 ${PLATFORM_LINKFLAGS} ${NELNET_LIBRARY} ${NELMISC_LIBRARY} ${ZLIB_LIBRARY} ${CURL_LIBRARY})
NL_DEFAULT_PROPS(nel_launcher_ext2 "Launcher: NeL Launcher Ext2")
NL_ADD_RUNTIME_FLAGS(nel_launcher_ext2)
INSTALL(TARGETS nel_launcher_ext2 RUNTIME DESTINATION bin COMPONENT launcher)
INSTALL(FILES nel_launcher.cfg DESTINATION etc/nel COMPONENT launcher)

15
code/snowballs2/server/position/src/CMakeLists.txt
View file

@ -1,14 +1,11 @@
FILE(GLOB SRC *.cpp *.h)
ADD_EXECUTABLE(sno_position ${SRC})
ADD_EXECUTABLE(sno_position WIN32 ${SRC})
INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${NELMISC_INCLUDE_DIRS})
TARGET_LINK_LIBRARIES(sno_position ${PLATFORM_LINKFLAGS} ${LIBXML2_LIBRARIES} ${NELMISC_LIBRARY} ${NELNET_LIBRARY})
IF(WIN32)
SET_TARGET_PROPERTIES(sno_position PROPERTIES
LINK_FLAGS "/NODEFAULTLIB:libcmt /SUBSYSTEM:WINDOWS"
PROJECT_LABEL "Services: Snowballs Position")
ENDIF(WIN32)
ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
INCLUDE_DIRECTORIES(${NELMISC_INCLUDE_DIRS})
TARGET_LINK_LIBRARIES(sno_position ${PLATFORM_LINKFLAGS} ${NELMISC_LIBRARY} ${NELNET_LIBRARY})
NL_DEFAULT_PROPS(sno_position "Services: Snowballs Position")
NL_ADD_RUNTIME_FLAGS(sno_position)
INSTALL(TARGETS sno_position RUNTIME DESTINATION sbin COMPONENT services)