xavi
/
speed-dreams
2
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Ticket #1021 wip 

git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@6789 30fe4595-0a0c-4342-8851-515496e4dcbd
This commit is contained in:
beaglejoe 2019-12-06 19:40:01 +00:00
parent 5212254b89
commit 085f771f6e
3 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
CMakeLists.txt
View File

@ -130,7 +130,12 @@ SD_INSTALL_FILES(DATA "/" FILES ${_SOURCES})
# Initialize user settings file management (before any of them is collected).
SD_SETUP_SETTINGS_VERSION()
# Sub-dirs to build ...
# Setup empty GLOBAL lists for robots and modules
SET_PROPERTY(GLOBAL PROPERTY SD_MODULE_LIST "")
SET_PROPERTY(GLOBAL PROPERTY SD_ROBOT_LIST "")
SET_PROPERTY(GLOBAL PROPERTY SD_OSG_PLUGIN_LIST "")
# Sub-dirs to build ...
ADD_SUBDIRECTORY(src)
ADD_SUBDIRECTORY(data)
ADD_SUBDIRECTORY(cmake)

3
cmake/macros.cmake
View File

@ -246,10 +246,13 @@ MACRO(SD_ADD_LIBRARY TARGET_NAME TARGET_TYPE)
GET_FILENAME_COMPONENT(_TGT_TYPE ${_TGT_LOC} PATH)
GET_FILENAME_COMPONENT(_TGT_TYPE ${_TGT_TYPE} NAME)
SET(_TGT_DIR "${CMAKE_BINARY_DIR}/${SD_LIBDIR}/modules/${_TGT_TYPE}")
SET_PROPERTY(GLOBAL APPEND PROPERTY SD_MODULE_LIST "${SD_LIBDIR}/modules/${_TGT_TYPE}/${TARGET_NAME}${CMAKE_SHARED_MODULE_SUFFIX}")
SET_TARGET_PROPERTIES(${TARGET_NAME} PROPERTIES SD_TYPE "MODULE")
ELSEIF(${TARGET_TYPE} STREQUAL "ROBOT")
SET(_TGT_DIR "${CMAKE_BINARY_DIR}/${SD_LIBDIR}/drivers/${TARGET_NAME}")
SET_PROPERTY(GLOBAL APPEND PROPERTY SD_ROBOT_LIST "${SD_LIBDIR}/drivers/${TARGET_NAME}/${TARGET_NAME}${CMAKE_SHARED_MODULE_SUFFIX}")
ELSEIF(NOT ${TARGET_TYPE} STREQUAL "STATIC")

1
cmake/robot.cmake
View File

@ -185,6 +185,7 @@ MACRO(ROBOT_MODULE)
SET(CLONE_MODDIR "${CMAKE_BINARY_DIR}/${SD_LIBDIR}/drivers/${CLONENAME}")
SET(CLONE_MODLOC "${CLONE_MODDIR}/${CLONENAME}${CMAKE_SHARED_MODULE_SUFFIX}")
SET_PROPERTY(GLOBAL APPEND PROPERTY SD_ROBOT_LIST "${SD_LIBDIR}/drivers/${CLONENAME}/${CLONENAME}${CMAKE_SHARED_MODULE_SUFFIX}")
IF(FALSE) #IF(UNIX)
# Might not work with GCC 4.5 or + (see above)
ADD_CUSTOM_COMMAND(TARGET ${RBM_NAME} POST_BUILD