Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 1978


Ignore:
Timestamp:
Oct 20, 2008, 5:53:36 PM (11 years ago)
Author:
adrfried
Message:

simplified use of -iquote

Location:
code/branches/buildsystem
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • code/branches/buildsystem/cmake/UseTolua.cmake

    r1883 r1978  
    1919GET_TARGET_PROPERTY(TOLUA_EXECUTABLE "${_tolua_executable_name}" LOCATION)
    2020
    21 SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -iquote ${CMAKE_CURRENT_SOURCE_DIR} -iquote ${CMAKE_CURRENT_BINARY_DIR}")
    22 SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -iquote ${CMAKE_CURRENT_SOURCE_DIR} -iquote ${CMAKE_CURRENT_BINARY_DIR}")
     21MACRO(INCLUDE_DIRECTORIES_QUOTES)
     22  FOREACH(_tolua_quote_dir ${ARGN})
     23    SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -iquote ${_tolua_quote_dir}")
     24    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -iquote ${_tolua_quote_dir}")
     25  ENDFOREACH(_tolua_quote_dir)
     26ENDMACRO(INCLUDE_DIRECTORIES_QUOTES)
    2327
    2428MACRO(TOLUA _tolua_package _tolua_srcfiles_varname)
  • code/branches/buildsystem/src/core/CMakeLists.txt

    r1977 r1978  
    5454INCLUDE(UseTolua)
    5555TOLUA(Core CORE_SRC_FILES INPUTFILES Script.h CommandExecutor.h)
     56INCLUDE_DIRECTORIES_QUOTES(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
    5657
    5758ADD_LIBRARY(core SHARED ${CORE_SRC_FILES})
  • code/branches/buildsystem/src/orxonox/CMakeLists.txt

    r1977 r1978  
    6666INCLUDE(UseTolua)
    6767TOLUA(Orxonox ORXONOX_SRC_FILES INPUTFILES gui/GUIManager.h)
    68 
    69 SET(CORE_SUBDIR src/core)
    70 SET(CORE_SOURCE_DIR "${CMAKE_SOURCE_DIR}/${CORE_SUBDIR}")
    71 SET(CORE_BINARY_DIR "${CMAKE_BINARY_DIR}/${CORE_SUBDIR}")
    72 SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -iquote ${CORE_SOURCE_DIR} -iquote ${CORE_BINARY_DIR}")
    73 SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -iquote ${CORE_SOURCE_DIR} -iquote ${CORE_BINARY_DIR}")
     68INCLUDE_DIRECTORIES_QUOTES(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
     69INCLUDE_DIRECTORIES_QUOTES("${CMAKE_SOURCE_DIR}/src/core" "${CMAKE_BINARY_DIR}/src/core")
    7470
    7571ADD_EXECUTABLE( orxonox ${ORXONOX_SRC_FILES} )
Note: See TracChangeset for help on using the changeset viewer.