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

Changed: Updated tools and samples CMake projects

Browse source
This commit is contained in:
kervala 2010-09-01 21:03:30 +02:00
parent d4caf01eb1
commit 16535f7e84
13 changed files with 62 additions and 100 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,19 +1,13 @@
FILE(GLOB SRC *.cpp *.h)
ADD_EXECUTABLE(nl_sample_cegui ${SRC})
ADD_EXECUTABLE(nl_sample_cegui WIN32 ${SRC})
ADD_DEFINITIONS(-DCEGUI_DATA_DIR="\\"${NL_SHARE_PREFIX}/nl_sample_cegui/datafiles/\\"")
INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${CEGUI_INCLUDE_DIRS})
TARGET_LINK_LIBRARIES(nl_sample_cegui ${LIBXML2_LIBRARIES} ${CEGUI_LIBRARY} ${PLATFORM_LINKFLAGS} nelmisc nel3d)
IF(WIN32)
SET_TARGET_PROPERTIES(nl_sample_cegui PROPERTIES
LINK_FLAGS_DEBUG "${CMAKE_LINK_FLAGS_DEBUG}"
LINK_FLAGS_RELEASE "${CMAKE_LINK_FLAGS_RELEASE}"
LINK_FLAGS "/SUBSYSTEM:WINDOWS"
PROJECT_LABEL "Samples, 3D: NeL CEGUI Demo")
ENDIF(WIN32)
ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
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)
INSTALL(TARGETS nl_sample_cegui RUNTIME DESTINATION bin COMPONENT samples3d)
INSTALL(DIRECTORY datafiles/

13
code/nel/samples/3d/qtnel/CMakeLists.txt
View file

@ -17,12 +17,15 @@ SET( QT_USE_QTOPENGL TRUE)
QT4_WRAP_CPP( QTNEL_MOC_SRCS ${QTNEL_HDR})
#ADD_EXECUTABLE(qtnel ${TILE_EDIT_SRC} ${TILE_EDIT_MOC_SRCS} ${TILE_EDIT_RC_SRCS} ${TILE_EDIT_UI_HDRS})
ADD_EXECUTABLE(qtnel ${QTNEL_SRC} ${QTNEL_MOC_SRCS} ${QTNEL_HDR})
ADD_EXECUTABLE(qtnel WIN32 ${QTNEL_SRC} ${QTNEL_MOC_SRCS} ${QTNEL_HDR})
INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${QT_INCLUDES})
TARGET_LINK_LIBRARIES(qtnel ${LIBXML2_LIBRARIES} ${QT_LIBRARIES} ${QT_QTOPENGL_LIBRARY} ${PLATFORM_LINKFLAGS} nelmisc nel3d)
SET_TARGET_PROPERTIES(qtnel PROPERTIES PROJECT_LABEL "Samples, 3D: Qt Viewer Widget")
ADD_DEFINITIONS(${LIBXML2_DEFINITIONS} ${QT_DEFINITIONS})
INCLUDE_DIRECTORIES(${QT_INCLUDES})
TARGET_LINK_LIBRARIES(qtnel ${QT_LIBRARIES} ${QT_QTOPENGL_LIBRARY} ${PLATFORM_LINKFLAGS} nelmisc nel3d)
NL_DEFAULT_PROPS(qtnel "Samples, 3D: Qt Viewer Widget")
NL_ADD_RUNTIME_FLAGS(qtnel)
ADD_DEFINITIONS(${QT_DEFINITIONS})
INSTALL(TARGETS qtnel RUNTIME DESTINATION bin COMPONENT samples3d)

6
code/nel/samples/misc/types_check/CMakeLists.txt
View file

@ -2,10 +2,8 @@ FILE(GLOB SRC *.cpp)
ADD_EXECUTABLE(nl_sample_types_check ${SRC})
INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
TARGET_LINK_LIBRARIES(nl_sample_types_check ${LIBXML2_LIBRARIES} ${PLATFORM_LINKFLAGS} nelmisc)
TARGET_LINK_LIBRARIES(nl_sample_types_check ${PLATFORM_LINKFLAGS} nelmisc)
NL_DEFAULT_PROPS(nl_sample_types_check "Samples, MISC: Types check sample")
NL_ADD_RUNTIME_FLAGS(nl_sample_types_check)
ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
INSTALL(TARGETS nl_sample_types_check RUNTIME DESTINATION bin COMPONENT samplesmisc)

12
code/nel/tools/3d/object_viewer/CMakeLists.txt
View file

@ -10,21 +10,17 @@ SET(CMAKE_MFC_FLAG 2)
ADD_LIBRARY(object_viewer_dll SHARED ${SRC} object_viewer.rc)
INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
TARGET_LINK_LIBRARIES(object_viewer_dll
${LIBXML2_LIBRARIES}
nelmisc
nel3d
nelsound
nelsnd_lowlevel
Version.lib)
SET_TARGET_PROPERTIES(object_viewer_dll PROPERTIES
VERSION ${NL_VERSION}
LINK_FLAGS_DEBUG "${CMAKE_LINK_FLAGS_DEBUG}"
LINK_FLAGS_RELEASE "${CMAKE_LINK_FLAGS_RELEASE}"
DEBUG_POSTFIX "_d"
RELEASE_POSTFIX "_r"
PROJECT_LABEL "Tools, 3D: Object Viewer DLL")
NL_DEFAULT_PROPS(object_viewer_dll "Tools, 3D: Object Viewer DLL")
NL_ADD_RUNTIME_FLAGS(object_viewer_dll)
NL_ADD_LIB_SUFFIX(object_viewer_dll)
ADD_DEFINITIONS(${LIBXML2_DEFINITIONS} -DOBJECT_VIEWER_LIB_EXPORTS)

9
code/nel/tools/3d/object_viewer_exe/CMakeLists.txt
View file

@ -5,21 +5,16 @@ ADD_DEFINITIONS(-D_AFXDLL)
SET(CMAKE_MFC_FLAG 2)
ADD_EXECUTABLE(object_viewer WIN32 ${SRC} object_viewer_exe.rc)
INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
TARGET_LINK_LIBRARIES( object_viewer
${LIBXML2_LIBRARIES}
${PLATFORM_LINKFLAGS}
nelmisc
nel3d
nelsound
nelsnd_lowlevel
object_viewer_dll)
ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
SET_TARGET_PROPERTIES(object_viewer PROPERTIES
LINK_FLAGS_DEBUG "${CMAKE_LINK_FLAGS_DEBUG}"
LINK_FLAGS_RELEASE "${CMAKE_LINK_FLAGS_RELEASE}"
PROJECT_LABEL "Tools, 3D: Object Viewer")
NL_DEFAULT_PROPS(object_viewer "Tools, 3D: Object Viewer")
NL_ADD_RUNTIME_FLAGS(object_viewer)
IF(WITH_PCH)
ADD_NATIVE_PRECOMPILED_HEADER(object_viewer ${CMAKE_CURRENT_SOURCE_DIR}/std_afx.h ${CMAKE_CURRENT_SOURCE_DIR}/std_afx.cpp)

16
code/nel/tools/3d/panoply_maker/CMakeLists.txt
View file

@ -2,16 +2,10 @@ FILE(GLOB SRC *.cpp *.h ../s3tc_compressor_lib/*.h ../s3tc_compressor_lib/*.cpp)
ADD_EXECUTABLE(panoply_maker ${SRC})
FIND_PACKAGE(Squish REQUIRED)
INCLUDE_DIRECTORIES(${SQUISH_INCLUDE_DIR})
INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${SQUISH_INCLUDE_DIR})
TARGET_LINK_LIBRARIES(panoply_maker ${LIBXML2_LIBRARIES} ${PLATFORM_LINKFLAGS} ${SQUISH_LIBRARY} nelmisc nel3d)
IF(WIN32)
SET_TARGET_PROPERTIES(panoply_maker PROPERTIES
LINK_FLAGS_DEBUG "${CMAKE_LINK_FLAGS_DEBUG}"
LINK_FLAGS_RELEASE "${CMAKE_LINK_FLAGS_RELEASE}"
PROJECT_LABEL "Tools, 3D: panoply_maker")
ENDIF(WIN32)
ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
TARGET_LINK_LIBRARIES(panoply_maker ${PLATFORM_LINKFLAGS} ${SQUISH_LIBRARY} nelmisc nel3d)
NL_DEFAULT_PROPS(panoply_maker "Tools, 3D: panoply_maker")
NL_ADD_RUNTIME_FLAGS(panoply_maker)
INSTALL(TARGETS panoply_maker RUNTIME DESTINATION bin COMPONENT tools3d)
INSTALL(TARGETS panoply_maker RUNTIME DESTINATION ${NL_BIN_PREFIX} COMPONENT tools3d)

18
code/nel/tools/3d/tile_edit/CMakeLists.txt
View file

@ -4,20 +4,14 @@ ENABLE_LANGUAGE(RC)
ADD_EXECUTABLE(tile_edit WIN32 ${SRC} tile_edit_exe.rc)
INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
TARGET_LINK_LIBRARIES( tile_edit
${LIBXML2_LIBRARIES}
${PLATFORM_LINKFLAGS}
nelmisc
nel3d)
ADD_DEFINITIONS(${LIBXML2_DEFINITIONS} -D_AFXDLL)
TARGET_LINK_LIBRARIES(tile_edit ${PLATFORM_LINKFLAGS} nelmisc nel3d)
NL_DEFAULT_PROPS(tile_edit "Tools, 3D: Tile Editor")
NL_ADD_RUNTIME_FLAGS(tile_edit)
ADD_DEFINITIONS(-D_AFXDLL)
IF(WIN32)
SET_TARGET_PROPERTIES(tile_edit PROPERTIES
LINK_FLAGS_DEBUG "${CMAKE_LINK_FLAGS_DEBUG}"
LINK_FLAGS_RELEASE "${CMAKE_LINK_FLAGS_RELEASE}"
EXCLUDE_FROM_DEFAULT_BUILD 1
PROJECT_LABEL "Tools, 3D: Tile Editor")
SET_TARGET_PROPERTIES(tile_edit PROPERTIES EXCLUDE_FROM_DEFAULT_BUILD 1)
ENDIF(WIN32)
#INSTALL(TARGETS tile_edit RUNTIME DESTINATION bin COMPONENT tools3d)

11
code/nel/tools/3d/tile_edit_qt/CMakeLists.txt
View file

@ -17,10 +17,13 @@ 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})
INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${QT_INCLUDES})
TARGET_LINK_LIBRARIES(tile_edit_qt ${LIBXML2_LIBRARIES} ${QT_LIBRARIES} ${PLATFORM_LINKFLAGS} nelmisc nel3d)
SET_TARGET_PROPERTIES(tile_edit_qt PROPERTIES PROJECT_LABEL "Tools, 3D: Qt Tile Editor")
ADD_DEFINITIONS(${LIBXML2_DEFINITIONS} ${QT_DEFINITIONS})
INCLUDE_DIRECTORIES(${QT_INCLUDES})
TARGET_LINK_LIBRARIES(tile_edit_qt ${QT_LIBRARIES} ${PLATFORM_LINKFLAGS} nelmisc nel3d)
NL_DEFAULT_PROPS(tile_edit_qt "Tools, 3D: Qt Tile Editor")
NL_ADD_RUNTIME_FLAGS(tile_edit_qt)
ADD_DEFINITIONS(${QT_DEFINITIONS})
INSTALL(TARGETS tile_edit_qt RUNTIME DESTINATION bin COMPONENT tools3d)

21
code/nel/tools/logic/logic_editor_dll/CMakeLists.txt
View file

@ -6,23 +6,10 @@ ADD_DEFINITIONS(-D_AFXDLL)
SET(CMAKE_MFC_FLAG 2)
ADD_LIBRARY(logic_editor_dll SHARED ${SRC})
INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
TARGET_LINK_LIBRARIES(logic_editor_dll ${LIBXML2_LIBRARIES} nelmisc nellogic nelnet)
SET_TARGET_PROPERTIES(logic_editor_dll PROPERTIES
VERSION ${NL_VERSION}
SOVERSION ${NL_VERSION_MAJOR}
DEBUG_POSTFIX "_d"
RELEASE_POSTFIX "_r"
PROJECT_LABEL "Tools, Logic: Logic Editor DLL")
IF(WIN32)
SET_TARGET_PROPERTIES(logic_editor_dll PROPERTIES
LINK_FLAGS_DEBUG "${CMAKE_LINK_FLAGS_DEBUG}"
LINK_FLAGS_RELEASE "${CMAKE_LINK_FLAGS_RELEASE}"
)
ENDIF(WIN32)
ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
TARGET_LINK_LIBRARIES(logic_editor_dll ${PLATFORM_LINKFLAGS} nelmisc nellogic nelnet)
NL_DEFAULT_PROPS(logic_editor_dll "Tools, Logic: Logic Editor DLL")
NL_ADD_RUNTIME_FLAGS(logic_editor_dll)
NL_ADD_LIB_SUFFIX(logic_editor_dll)
IF(WITH_PCH)
ADD_NATIVE_PRECOMPILED_HEADER(logic_editor_dll ${CMAKE_CURRENT_SOURCE_DIR}/StdAfx.h ${CMAKE_CURRENT_SOURCE_DIR}/StdAfx.cpp)

13
code/nel/tools/logic/logic_editor_exe/CMakeLists.txt
View file

@ -2,16 +2,9 @@ FILE(GLOB SRC *.cpp *.h)
ADD_EXECUTABLE(logic_editor WIN32 ${SRC})
INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
TARGET_LINK_LIBRARIES(logic_editor ${LIBXML2_LIBRARIES} ${PLATFORM_LINKFLAGS} nelmisc logic_editor_dll)
ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
IF(WIN32)
SET_TARGET_PROPERTIES(logic_editor PROPERTIES
LINK_FLAGS_DEBUG "${CMAKE_LINK_FLAGS_DEBUG}"
LINK_FLAGS_RELEASE "${CMAKE_LINK_FLAGS_RELEASE}"
PROJECT_LABEL "Tools, Logic: Logic Editor")
ENDIF(WIN32)
TARGET_LINK_LIBRARIES(logic_editor ${PLATFORM_LINKFLAGS} nelmisc logic_editor_dll)
NL_DEFAULT_PROPS(logic_editor "Tools, Logic: Logic Editor")
NL_ADD_RUNTIME_FLAGS(logic_editor)
IF(WITH_PCH)
ADD_NATIVE_PRECOMPILED_HEADER(logic_editor ${CMAKE_CURRENT_SOURCE_DIR}/StdAfx.h ${CMAKE_CURRENT_SOURCE_DIR}/StdAfx.cpp)

10
code/nel/tools/misc/message_box_qt/CMakeLists.txt
View file

@ -9,10 +9,12 @@ SET( QT_USE_QTXML TRUE)
ADD_EXECUTABLE(message_box_qt ${MESSAGE_BOX_SRC})
INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${QT_INCLUDES})
TARGET_LINK_LIBRARIES(message_box_qt ${LIBXML2_LIBRARIES} ${QT_LIBRARIES} ${PLATFORM_LINKFLAGS} nelmisc)
SET_TARGET_PROPERTIES(message_box_qt PROPERTIES PROJECT_LABEL "Tools, Misc: Qt Message Box")
ADD_DEFINITIONS(${LIBXML2_DEFINITIONS} ${QT_DEFINITIONS})
INCLUDE_DIRECTORIES(${QT_INCLUDES})
TARGET_LINK_LIBRARIES(message_box_qt ${QT_LIBRARIES} ${PLATFORM_LINKFLAGS} nelmisc)
NL_DEFAULT_PROPS(message_box_qt "Tools, Misc: Qt Message Box")
ADD_DEFINITIONS(${QT_DEFINITIONS})
INSTALL(TARGETS message_box_qt RUNTIME DESTINATION bin COMPONENT toolsmisc)

11
code/nel/tools/misc/words_dic_qt/CMakeLists.txt
View file

@ -22,10 +22,13 @@ QT4_WRAP_CPP( WORDS_DIC_MOC_SRCS ${WORDS_DIC_HDR})
ADD_EXECUTABLE(words_dic_qt ${WORDS_DIC_SRC} ${WORDS_DIC_MOC_SRCS} ${WORDS_DIC_RC_SRCS} ${WORDS_DIC_UI_HDRS} ${WORDS_DIC_RC})
INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${QT_INCLUDES})
TARGET_LINK_LIBRARIES(words_dic_qt ${LIBXML2_LIBRARIES} ${QT_LIBRARIES} ${PLATFORM_LINKFLAGS} nelmisc)
SET_TARGET_PROPERTIES(words_dic_qt PROPERTIES PROJECT_LABEL "Tools, Misc: Qt Words Dic")
ADD_DEFINITIONS(${LIBXML2_DEFINITIONS} ${QT_DEFINITIONS})
INCLUDE_DIRECTORIES(${QT_INCLUDES})
TARGET_LINK_LIBRARIES(words_dic_qt ${QT_LIBRARIES} ${PLATFORM_LINKFLAGS} nelmisc)
NL_DEFAULT_PROPS(words_dic_qt "Tools, Misc: Qt Words Dic")
NL_ADD_RUNTIME_FLAGS(words_dic_qt)
ADD_DEFINITIONS(${QT_DEFINITIONS})
INSTALL(TARGETS words_dic_qt RUNTIME DESTINATION bin COMPONENT toolsmisc)
INSTALL(FILES words_dic.cfg DESTINATION etc/nel COMPONENT toolsmisc)

6
code/nel/tools/nel_unit_test/CMakeLists.txt
View file

@ -2,12 +2,12 @@ FILE(GLOB SRC *.cpp *.h)
ADD_EXECUTABLE(nel_unit_test ${SRC})
INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${CPPTEST_INCLUDE_DIR})
TARGET_LINK_LIBRARIES(nel_unit_test ${LIBXML2_LIBRARIES} ${CPPTEST_LIBRARY} ${PLATFORM_LINKFLAGS} nelmisc nelnet nelligo)
INCLUDE_DIRECTORIES(${CPPTEST_INCLUDE_DIR})
TARGET_LINK_LIBRARIES(nel_unit_test ${CPPTEST_LIBRARY} ${PLATFORM_LINKFLAGS} nelmisc nelnet nelligo)
NL_DEFAULT_PROPS(nel_unit_test "Unit Tests")
NL_ADD_RUNTIME_FLAGS(nel_unit_test)
ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
ADD_DEFINITIONS(-DNEL_UNIT_BASE="\\"${PROJECT_SOURCE_DIR}/tools/nel_unit_test/\\"")
INSTALL(TARGETS nel_unit_test RUNTIME DESTINATION bin)