From 8083f47f35e9891bd99a71c3a70544a4828ccbeb Mon Sep 17 00:00:00 2001 From: kervala Date: Tue, 26 Jan 2016 23:43:34 +0100 Subject: [PATCH] Merge with develop --- code/nel/tools/pacs/build_rbank/CMakeLists.txt | 4 ---- code/nel/tools/sound/build_samplebank/CMakeLists.txt | 4 ---- code/nel/tools/sound/build_sound/CMakeLists.txt | 4 ---- code/nel/tools/sound/build_soundbank/CMakeLists.txt | 4 ---- 4 files changed, 16 deletions(-) diff --git a/code/nel/tools/pacs/build_rbank/CMakeLists.txt b/code/nel/tools/pacs/build_rbank/CMakeLists.txt index b35cb808c..65e86394d 100644 --- a/code/nel/tools/pacs/build_rbank/CMakeLists.txt +++ b/code/nel/tools/pacs/build_rbank/CMakeLists.txt @@ -4,13 +4,9 @@ ADD_EXECUTABLE(build_rbank ${SRC}) ADD_DEFINITIONS(-DNL_BRB_CFG="\\"${NL_ETC_PREFIX}/\\"") -INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR}) - TARGET_LINK_LIBRARIES(build_rbank nelpacs nel3d nelligo nelmisc) NL_DEFAULT_PROPS(build_rbank "NeL, Tools, PACS: build_rbank") NL_ADD_RUNTIME_FLAGS(build_rbank) -ADD_DEFINITIONS(${LIBXML2_DEFINITIONS}) - INSTALL(TARGETS build_rbank RUNTIME DESTINATION ${NL_BIN_PREFIX} COMPONENT toolspacs) INSTALL(FILES build_rbank.cfg DESTINATION ${NL_ETC_PREFIX} COMPONENT toolspacs) diff --git a/code/nel/tools/sound/build_samplebank/CMakeLists.txt b/code/nel/tools/sound/build_samplebank/CMakeLists.txt index ab427373c..b86e1e3e7 100644 --- a/code/nel/tools/sound/build_samplebank/CMakeLists.txt +++ b/code/nel/tools/sound/build_samplebank/CMakeLists.txt @@ -2,10 +2,6 @@ FILE(GLOB SRC *.cpp *.h) ADD_EXECUTABLE(build_samplebank ${SRC}) -ADD_DEFINITIONS( ${LIBXML2_DEFINITIONS}) - -INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR}) - TARGET_LINK_LIBRARIES(build_samplebank nelmisc nelsound) NL_DEFAULT_PROPS(build_samplebank "NeL, Tools, Sound: build_samplebank") NL_ADD_RUNTIME_FLAGS(build_samplebank) diff --git a/code/nel/tools/sound/build_sound/CMakeLists.txt b/code/nel/tools/sound/build_sound/CMakeLists.txt index 7813e4e8f..5a5d81e81 100644 --- a/code/nel/tools/sound/build_sound/CMakeLists.txt +++ b/code/nel/tools/sound/build_sound/CMakeLists.txt @@ -2,10 +2,6 @@ FILE(GLOB SRC *.cpp *.h) ADD_EXECUTABLE(build_sound ${SRC}) -ADD_DEFINITIONS( ${LIBXML2_DEFINITIONS}) - -INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR}) - TARGET_LINK_LIBRARIES(build_sound nelmisc nelsound) NL_DEFAULT_PROPS(build_sound "NeL, Tools, Sound: build_sound") NL_ADD_RUNTIME_FLAGS(build_sound) diff --git a/code/nel/tools/sound/build_soundbank/CMakeLists.txt b/code/nel/tools/sound/build_soundbank/CMakeLists.txt index 4431a47b8..310e6a2c5 100644 --- a/code/nel/tools/sound/build_soundbank/CMakeLists.txt +++ b/code/nel/tools/sound/build_soundbank/CMakeLists.txt @@ -2,10 +2,6 @@ FILE(GLOB SRC *.cpp *.h) ADD_EXECUTABLE(build_soundbank ${SRC}) -ADD_DEFINITIONS( ${LIBXML2_DEFINITIONS}) - -INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR}) - TARGET_LINK_LIBRARIES(build_soundbank nelmisc nelsound) NL_DEFAULT_PROPS(build_soundbank "NeL, Tools, Sound: build_soundbank") NL_ADD_RUNTIME_FLAGS(build_soundbank)