Update CMakeLists.txt to make samples work again
This commit is contained in:
parent
edb19ee4d8
commit
03c2cfe683
6 changed files with 14 additions and 14 deletions
|
@ -2,7 +2,7 @@ FILE(GLOB SRC *.cpp)
|
||||||
|
|
||||||
ADD_EXECUTABLE(nl_sample_georges ${SRC})
|
ADD_EXECUTABLE(nl_sample_georges ${SRC})
|
||||||
|
|
||||||
ADD_DEFINITIONS(-DGF_DIR="\\"${NL_SHARE_ABSOLUTE_PREFIX}/nl_sample_georges/\\"")
|
ADD_DEFINITIONS(-DGF_DIR="${NL_SHARE_ABSOLUTE_PREFIX}/nl_sample_georges_config/")
|
||||||
|
|
||||||
TARGET_LINK_LIBRARIES(nl_sample_georges nelgeorges nelmisc)
|
TARGET_LINK_LIBRARIES(nl_sample_georges nelgeorges nelmisc)
|
||||||
NL_DEFAULT_PROPS(nl_sample_georges "NeL, Samples: Georges")
|
NL_DEFAULT_PROPS(nl_sample_georges "NeL, Samples: Georges")
|
||||||
|
@ -10,4 +10,4 @@ NL_ADD_RUNTIME_FLAGS(nl_sample_georges)
|
||||||
|
|
||||||
INSTALL(TARGETS nl_sample_georges RUNTIME DESTINATION ${NL_BIN_PREFIX} COMPONENT samplesgeorges)
|
INSTALL(TARGETS nl_sample_georges RUNTIME DESTINATION ${NL_BIN_PREFIX} COMPONENT samplesgeorges)
|
||||||
INSTALL(FILES boolean.typ coolfilesinfo.dfn default.sample_config int.typ positiondata.dfn sample_config.dfn string.typ sheet_id.bin
|
INSTALL(FILES boolean.typ coolfilesinfo.dfn default.sample_config int.typ positiondata.dfn sample_config.dfn string.typ sheet_id.bin
|
||||||
DESTINATION ${NL_SHARE_PREFIX}/nl_sample_georges/ COMPONENT samplesgeorges)
|
DESTINATION ${NL_SHARE_PREFIX}/nl_sample_georges_config/ COMPONENT samplesgeorges)
|
||||||
|
|
|
@ -2,11 +2,11 @@ FILE(GLOB SRC *.cpp)
|
||||||
|
|
||||||
ADD_EXECUTABLE(nl_sample_configfile ${SRC})
|
ADD_EXECUTABLE(nl_sample_configfile ${SRC})
|
||||||
|
|
||||||
ADD_DEFINITIONS(-DNL_SAMPLE_CFG="\\"${NL_SHARE_ABSOLUTE_PREFIX}/nl_sample_configfile/\\"")
|
ADD_DEFINITIONS(-DNL_SAMPLE_CFG="${NL_SHARE_ABSOLUTE_PREFIX}/nl_sample_configfile_config/")
|
||||||
|
|
||||||
TARGET_LINK_LIBRARIES(nl_sample_configfile nelmisc)
|
TARGET_LINK_LIBRARIES(nl_sample_configfile nelmisc)
|
||||||
NL_DEFAULT_PROPS(nl_sample_configfile "NeL, Samples, Misc: Config Files")
|
NL_DEFAULT_PROPS(nl_sample_configfile "NeL, Samples, Misc: Config Files")
|
||||||
NL_ADD_RUNTIME_FLAGS(nl_sample_configfile)
|
NL_ADD_RUNTIME_FLAGS(nl_sample_configfile)
|
||||||
|
|
||||||
INSTALL(TARGETS nl_sample_configfile RUNTIME DESTINATION ${NL_BIN_PREFIX} COMPONENT samplesmisc)
|
INSTALL(TARGETS nl_sample_configfile RUNTIME DESTINATION ${NL_BIN_PREFIX} COMPONENT samplesmisc)
|
||||||
INSTALL(FILES simpletest.txt DESTINATION ${NL_SHARE_PREFIX}/nl_sample_configfile COMPONENT samplesmisc)
|
INSTALL(FILES simpletest.txt DESTINATION ${NL_SHARE_PREFIX}/nl_sample_configfile_config COMPONENT samplesmisc)
|
||||||
|
|
|
@ -2,11 +2,11 @@ FILE(GLOB SRC *.cpp)
|
||||||
|
|
||||||
ADD_EXECUTABLE(nl_sample_i18n ${SRC})
|
ADD_EXECUTABLE(nl_sample_i18n ${SRC})
|
||||||
|
|
||||||
ADD_DEFINITIONS(-DNL_LANG_DATA="\\"${NL_SHARE_ABSOLUTE_PREFIX}/nl_sample_i18n/\\"")
|
ADD_DEFINITIONS(-DNL_LANG_DATA="${NL_SHARE_ABSOLUTE_PREFIX}/nl_sample_i18n_config/")
|
||||||
|
|
||||||
TARGET_LINK_LIBRARIES(nl_sample_i18n nelmisc)
|
TARGET_LINK_LIBRARIES(nl_sample_i18n nelmisc)
|
||||||
NL_DEFAULT_PROPS(nl_sample_i18n "NeL, Samples, Misc: I18N")
|
NL_DEFAULT_PROPS(nl_sample_i18n "NeL, Samples, Misc: I18N")
|
||||||
NL_ADD_RUNTIME_FLAGS(nl_sample_i18n)
|
NL_ADD_RUNTIME_FLAGS(nl_sample_i18n)
|
||||||
|
|
||||||
INSTALL(TARGETS nl_sample_i18n RUNTIME DESTINATION ${NL_BIN_PREFIX} COMPONENT samplesmisc)
|
INSTALL(TARGETS nl_sample_i18n RUNTIME DESTINATION ${NL_BIN_PREFIX} COMPONENT samplesmisc)
|
||||||
INSTALL(FILES de.uxt en.uxt fr.uxt DESTINATION ${NL_SHARE_PREFIX}/nl_sample_i18n COMPONENT samplesmisc)
|
INSTALL(FILES de.uxt en.uxt fr.uxt DESTINATION ${NL_SHARE_PREFIX}/nl_sample_i18n_config COMPONENT samplesmisc)
|
||||||
|
|
|
@ -1,8 +1,6 @@
|
||||||
ADD_SUBDIRECTORY(chat)
|
ADD_SUBDIRECTORY(chat)
|
||||||
|
|
||||||
IF(WITH_3D)
|
|
||||||
ADD_SUBDIRECTORY(udp)
|
ADD_SUBDIRECTORY(udp)
|
||||||
ENDIF()
|
|
||||||
|
|
||||||
ADD_SUBDIRECTORY(login_system)
|
ADD_SUBDIRECTORY(login_system)
|
||||||
ADD_SUBDIRECTORY(class_transport)
|
ADD_SUBDIRECTORY(class_transport)
|
||||||
|
|
|
@ -4,13 +4,15 @@ ADD_EXECUTABLE(nl_sample_udpclient client.cpp graph.cpp graph.h simlag.cpp simla
|
||||||
|
|
||||||
ADD_EXECUTABLE(nl_sample_udpserver WIN32 bench_service.cpp receive_task.cpp receive_task.h)
|
ADD_EXECUTABLE(nl_sample_udpserver WIN32 bench_service.cpp receive_task.cpp receive_task.h)
|
||||||
|
|
||||||
ADD_DEFINITIONS(-DUDP_DIR="\\"${NL_SHARE_ABSOLUTE_PREFIX}/nl_sample_udp/\\"")
|
ADD_DEFINITIONS(-DUDP_DIR="${NL_SHARE_ABSOLUTE_PREFIX}/nl_sample_udp/")
|
||||||
|
|
||||||
IF(WITH_3D)
|
IF(WITH_3D)
|
||||||
ADD_DEFINITIONS(-DUSE_3D)
|
ADD_DEFINITIONS(-DUSE_3D)
|
||||||
|
TARGET_LINK_LIBRARIES(nl_sample_udpclient nelmisc nelnet nel3d)
|
||||||
|
ELSE()
|
||||||
|
TARGET_LINK_LIBRARIES(nl_sample_udpclient nelmisc nelnet)
|
||||||
ENDIF()
|
ENDIF()
|
||||||
|
|
||||||
TARGET_LINK_LIBRARIES(nl_sample_udpclient nelmisc nelnet nel3d)
|
|
||||||
TARGET_LINK_LIBRARIES(nl_sample_udpserver nelmisc nelnet)
|
TARGET_LINK_LIBRARIES(nl_sample_udpserver nelmisc nelnet)
|
||||||
NL_DEFAULT_PROPS(nl_sample_udpclient "NeL, Samples, Net, UDP: UDP Client")
|
NL_DEFAULT_PROPS(nl_sample_udpclient "NeL, Samples, Net, UDP: UDP Client")
|
||||||
NL_DEFAULT_PROPS(nl_sample_udpserver "NeL, Samples, Net, UDP: UDP Server")
|
NL_DEFAULT_PROPS(nl_sample_udpserver "NeL, Samples, Net, UDP: UDP Server")
|
||||||
|
|
|
@ -2,16 +2,16 @@ FILE(GLOB SRC *.cpp *.h)
|
||||||
|
|
||||||
ADD_EXECUTABLE(nl_sample_pacs WIN32 ${SRC})
|
ADD_EXECUTABLE(nl_sample_pacs WIN32 ${SRC})
|
||||||
|
|
||||||
ADD_DEFINITIONS(-DNL_PACS_DATA="\\"${NL_SHARE_ABSOLUTE_PREFIX}/nl_sample_pacs/\\"")
|
ADD_DEFINITIONS(-DNL_PACS_DATA="${NL_SHARE_ABSOLUTE_PREFIX}/nl_sample_pacs_config/")
|
||||||
|
|
||||||
TARGET_LINK_LIBRARIES(nl_sample_pacs nelmisc nelpacs nel3d)
|
TARGET_LINK_LIBRARIES(nl_sample_pacs nelmisc nelpacs nel3d)
|
||||||
NL_DEFAULT_PROPS(nl_sample_pacs "NeL, Samples: PACS")
|
NL_DEFAULT_PROPS(nl_sample_pacs "NeL, Samples: PACS")
|
||||||
NL_ADD_RUNTIME_FLAGS(nl_sample_pacs)
|
NL_ADD_RUNTIME_FLAGS(nl_sample_pacs)
|
||||||
|
|
||||||
INSTALL(TARGETS nl_sample_pacs RUNTIME DESTINATION ${NL_BIN_PREFIX} COMPONENT samplespacs)
|
INSTALL(TARGETS nl_sample_pacs RUNTIME DESTINATION ${NL_BIN_PREFIX} COMPONENT samplespacs)
|
||||||
INSTALL(FILES readme.txt DESTINATION ${NL_SHARE_PREFIX}/nl_sample_pacs COMPONENT samplespacs)
|
INSTALL(FILES readme.txt DESTINATION ${NL_SHARE_PREFIX}/nl_sample_pacs_config COMPONENT samplespacs)
|
||||||
INSTALL(DIRECTORY shapes/
|
INSTALL(DIRECTORY shapes/
|
||||||
DESTINATION ${NL_SHARE_PREFIX}/nl_sample_pacs/shapes
|
DESTINATION ${NL_SHARE_PREFIX}/nl_sample_pacs_config/shapes
|
||||||
COMPONENT samplespacs
|
COMPONENT samplespacs
|
||||||
PATTERN "CVS" EXCLUDE
|
PATTERN "CVS" EXCLUDE
|
||||||
PATTERN ".svn" EXCLUDE
|
PATTERN ".svn" EXCLUDE
|
||||||
|
|
Loading…
Reference in a new issue