From e3a11741cbbf70070e2e31e6c640583fbbd1c8ae Mon Sep 17 00:00:00 2001 From: mattraykowski Date: Tue, 21 Sep 2010 06:59:56 -0500 Subject: [PATCH 1/2] Changed: #1102 Explicitly link nelmisc in ig_lighter. --- code/nel/tools/3d/ig_lighter/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/nel/tools/3d/ig_lighter/CMakeLists.txt b/code/nel/tools/3d/ig_lighter/CMakeLists.txt index efbdc16f4..baae59f38 100644 --- a/code/nel/tools/3d/ig_lighter/CMakeLists.txt +++ b/code/nel/tools/3d/ig_lighter/CMakeLists.txt @@ -2,7 +2,7 @@ FILE(GLOB SRC *.cpp *.h ../ig_lighter_lib/*.cpp ../ig_lighter_lib/*.h) ADD_EXECUTABLE(ig_lighter ${SRC}) -TARGET_LINK_LIBRARIES(ig_lighter ${PLATFORM_LINKFLAGS} nel3d nelpacs) +TARGET_LINK_LIBRARIES(ig_lighter ${PLATFORM_LINKFLAGS} nelmisc nel3d nelpacs) NL_DEFAULT_PROPS(ig_lighter "NeL, Tools, 3D: ig_lighter") NL_ADD_RUNTIME_FLAGS(ig_lighter) From d41eb56f38aa58401aec418e61433cc86c704453 Mon Sep 17 00:00:00 2001 From: mattraykowski Date: Tue, 21 Sep 2010 07:02:21 -0500 Subject: [PATCH 2/2] Changed: Added source groups to Tile Edit Qt. --- code/nel/tools/3d/tile_edit_qt/CMakeLists.txt | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/code/nel/tools/3d/tile_edit_qt/CMakeLists.txt b/code/nel/tools/3d/tile_edit_qt/CMakeLists.txt index be955fd03..087e948b1 100644 --- a/code/nel/tools/3d/tile_edit_qt/CMakeLists.txt +++ b/code/nel/tools/3d/tile_edit_qt/CMakeLists.txt @@ -1,7 +1,8 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${QT_INCLUDES}) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${QT_INCLUDES} ${CMAKE_CURRENT_SOURCE_DIR}/pic) INCLUDE( ${QT_USE_FILE} ) -FILE(GLOB TILE_EDIT_SRC *.cpp pic/*.c pic/*.cpp) +FILE(GLOB TILE_EDIT_SRC *.cpp *.h) +FILE(GLOB PIC_SRC pic/*.c pic/*.cpp) SET(TILE_EDIT_HDR items_edit_dlg.h tile_browser_dlg.h tile_edit_dlg.h tile_rotation_dlg.h tiles_model.h tile_widget.h) SET(TILE_EDIT_UIS tile_widget_qt.ui tile_rotation_qt.ui tile_edit_qt.ui tile_browser_qt.ui items_edit_qt.ui) SET(TILE_EDIT_RCS tile_edit_qt.qrc) @@ -10,7 +11,12 @@ QT4_ADD_RESOURCES( TILE_EDIT_RC_SRCS ${TILE_EDIT_RCS} ) QT4_WRAP_UI( TILE_EDIT_UI_HDRS ${TILE_EDIT_UIS} ) QT4_WRAP_CPP( TILE_EDIT_MOC_SRCS ${TILE_EDIT_HDR}) -ADD_EXECUTABLE(tile_edit_qt ${TILE_EDIT_SRC} ${TILE_EDIT_MOC_SRCS} ${TILE_EDIT_RC_SRCS} ${TILE_EDIT_UI_HDRS}) +SOURCE_GROUP(QtResources FILES ${TILE_EDIT_UIS} ${TILE_EDIT_RCS}) +SOURCE_GROUP(QtGeneratedUiHdr FILES ${TILE_EDIT_UI_HDRS}) +SOURCE_GROUP(QtGeneratedMocSrc FILES ${TILE_EDIT_MOC_SRCS}) +SOURCE_GROUP(PICLibrary FILES ${PIC_SRC}) + +ADD_EXECUTABLE(tile_edit_qt ${TILE_EDIT_SRC} ${PIC_SRC} ${TILE_EDIT_MOC_SRCS} ${TILE_EDIT_RC_SRCS} ${TILE_EDIT_UI_HDRS}) TARGET_LINK_LIBRARIES(tile_edit_qt ${QT_LIBRARIES} ${PLATFORM_LINKFLAGS} nelmisc nel3d) NL_DEFAULT_PROPS(tile_edit_qt "Tools, 3D: Qt Tile Editor")