Changed: Updated tools CMake projects

This commit is contained in:
kervala 2010-09-01 10:03:34 +02:00
parent 267a39ee02
commit a638bfabb1
7 changed files with 21 additions and 31 deletions

View file

@ -25,7 +25,6 @@ SUBDIRS( build_coarse_mesh
IF(WIN32) IF(WIN32)
ADD_SUBDIRECTORY(object_viewer) ADD_SUBDIRECTORY(object_viewer)
ADD_SUBDIRECTORY(object_viewer_exe) ADD_SUBDIRECTORY(object_viewer_exe)
ADD_SUBDIRECTORY(panoply_maker)
ADD_SUBDIRECTORY(tile_edit) ADD_SUBDIRECTORY(tile_edit)
ENDIF(WIN32) ENDIF(WIN32)
@ -41,6 +40,7 @@ IF(WITH_MAXPLUGIN)
ENDIF(WITH_MAXPLUGIN) ENDIF(WITH_MAXPLUGIN)
IF(SQUISH_FOUND) IF(SQUISH_FOUND)
ADD_SUBDIRECTORY(panoply_maker)
ADD_SUBDIRECTORY(tga_2_dds) ADD_SUBDIRECTORY(tga_2_dds)
ENDIF(SQUISH_FOUND) ENDIF(SQUISH_FOUND)

View file

@ -1,12 +1,13 @@
FILE(GLOB SRC *.cpp *.h) FILE(GLOB SRC *.cpp *.h)
DECORATE_NEL_LIB("nel3d")
SET(NL3D_LIB ${LIBNAME})
ADD_EXECUTABLE(ig_elevation ${SRC}) ADD_EXECUTABLE(ig_elevation ${SRC})
INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR}) INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
TARGET_LINK_LIBRARIES(ig_elevation ${LIBXML2_LIBRARIES} ${PLATFORM_LINKFLAGS} ${NL3D_LIB})
TARGET_LINK_LIBRARIES(ig_elevation ${PLATFORM_LINKFLAGS} nelmisc nel3d)
NL_DEFAULT_PROPS(ig_elevation "Tools, 3D: ig_elevation")
NL_ADD_RUNTIME_FLAGS(ig_elevation)
ADD_DEFINITIONS(${LIBXML2_DEFINITIONS}) ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
INSTALL(TARGETS ig_elevation RUNTIME DESTINATION ${NL_BIN_PREFIX} COMPONENT tools3d) INSTALL(TARGETS ig_elevation RUNTIME DESTINATION ${NL_BIN_PREFIX} COMPONENT tools3d)

View file

@ -1,12 +1,9 @@
FILE(GLOB SRC *.cpp *.h) FILE(GLOB SRC *.cpp *.h)
DECORATE_NEL_LIB("nelmisc")
SET(NLMISC_LIB ${LIBNAME})
ADD_EXECUTABLE(lightmap_optimizer ${SRC}) ADD_EXECUTABLE(lightmap_optimizer ${SRC})
INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR}) TARGET_LINK_LIBRARIES(lightmap_optimizer ${PLATFORM_LINKFLAGS} nelmisc)
TARGET_LINK_LIBRARIES(lightmap_optimizer ${LIBXML2_LIBRARIES} ${PLATFORM_LINKFLAGS} ${NLMISC_LIB}) NL_DEFAULT_PROPS(lightmap_optimizer "Tools, 3D: lightmap_optimizer")
ADD_DEFINITIONS(${LIBXML2_DEFINITIONS}) NL_ADD_RUNTIME_FLAGS(lightmap_optimizer)
INSTALL(TARGETS lightmap_optimizer RUNTIME DESTINATION ${NL_BIN_PREFIX} COMPONENT tools3d) INSTALL(TARGETS lightmap_optimizer RUNTIME DESTINATION ${NL_BIN_PREFIX} COMPONENT tools3d)

View file

@ -1,16 +1,9 @@
FILE(GLOB SRC *.cpp *.h) FILE(GLOB SRC *.cpp *.h)
ADD_EXECUTABLE(shapes_exporter ${SRC}) ADD_EXECUTABLE(shapes_exporter WIN32 ${SRC})
INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR}) TARGET_LINK_LIBRARIES(shapes_exporter ${PLATFORM_LINKFLAGS} nelmisc nel3d)
TARGET_LINK_LIBRARIES(shapes_exporter ${LIBXML2_LIBRARIES} ${PLATFORM_LINKFLAGS} nelmisc nel3d) NL_DEFAULT_PROPS(shapes_exporter "Tools, 3D: Shapes Exporter")
IF(WIN32) NL_ADD_RUNTIME_FLAGS(shapes_exporter)
SET_TARGET_PROPERTIES(shapes_exporter PROPERTIES
LINK_FLAGS_DEBUG "${CMAKE_LINK_FLAGS_DEBUG}"
LINK_FLAGS_RELEASE "${CMAKE_LINK_FLAGS_RELEASE}"
LINK_FLAGS "/SUBSYSTEM:WINDOWS"
PROJECT_LABEL "Tools, 3D: Shapes Exporter")
ENDIF(WIN32)
ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
INSTALL(TARGETS shapes_exporter RUNTIME DESTINATION ${NL_BIN_PREFIX} COMPONENT tools3d) INSTALL(TARGETS shapes_exporter RUNTIME DESTINATION ${NL_BIN_PREFIX} COMPONENT tools3d)

View file

@ -2,14 +2,8 @@ FILE(GLOB SRC *.cpp *.h ../zone_lib/*.cpp ../zone_lib/*.h)
ADD_EXECUTABLE(zone_ig_lighter ${SRC}) ADD_EXECUTABLE(zone_ig_lighter ${SRC})
INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR}) TARGET_LINK_LIBRARIES(zone_ig_lighter ${PLATFORM_LINKFLAGS} nelmisc nel3d)
TARGET_LINK_LIBRARIES(zone_ig_lighter ${LIBXML2_LIBRARIES} ${PLATFORM_LINKFLAGS} nel3d) NL_DEFAULT_PROPS(zone_ig_lighter "Tools, 3D: zone_ig_lighter")
IF(WIN32) NL_ADD_RUNTIME_FLAGS(zone_ig_lighter)
SET_TARGET_PROPERTIES(zone_ig_lighter PROPERTIES
LINK_FLAGS_DEBUG "${CMAKE_LINK_FLAGS_DEBUG}"
LINK_FLAGS_RELEASE "${CMAKE_LINK_FLAGS_RELEASE}"
PROJECT_LABEL "Tools, 3D: zone_ig_lighter")
ENDIF(WIN32)
ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
INSTALL(TARGETS zone_ig_lighter RUNTIME DESTINATION bin COMPONENT tools3d) INSTALL(TARGETS zone_ig_lighter RUNTIME DESTINATION bin COMPONENT tools3d)

View file

@ -3,8 +3,11 @@ FILE(GLOB SRC *.cpp *.h)
ADD_EXECUTABLE(georges2csv ${SRC}) ADD_EXECUTABLE(georges2csv ${SRC})
INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR}) INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
TARGET_LINK_LIBRARIES(georges2csv ${PLATFORM_LINKFLAGS} nelmisc nelgeorges) TARGET_LINK_LIBRARIES(georges2csv ${PLATFORM_LINKFLAGS} nelmisc nelgeorges)
NL_DEFAULT_PROPS(georges2csv "Tools, Georges: georges2csv") NL_DEFAULT_PROPS(georges2csv "Tools, Georges: georges2csv")
NL_ADD_RUNTIME_FLAGS(georges2csv) NL_ADD_RUNTIME_FLAGS(georges2csv)
ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
INSTALL(TARGETS georges2csv RUNTIME DESTINATION bin COMPONENT toolsgeorges) INSTALL(TARGETS georges2csv RUNTIME DESTINATION bin COMPONENT toolsgeorges)

View file

@ -10,5 +10,7 @@ TARGET_LINK_LIBRARIES(build_rbank ${PLATFORM_LINKFLAGS} nelpacs nel3d nelligo ne
NL_DEFAULT_PROPS(build_rbank "Tools, PACS: build_rbank") NL_DEFAULT_PROPS(build_rbank "Tools, PACS: build_rbank")
NL_ADD_RUNTIME_FLAGS(build_rbank) NL_ADD_RUNTIME_FLAGS(build_rbank)
ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
INSTALL(TARGETS build_rbank RUNTIME DESTINATION bin COMPONENT toolspacs) INSTALL(TARGETS build_rbank RUNTIME DESTINATION bin COMPONENT toolspacs)
INSTALL(FILES build_rbank.cfg DESTINATION etc/nel COMPONENT toolspacs) INSTALL(FILES build_rbank.cfg DESTINATION etc/nel COMPONENT toolspacs)