Changeset 1978 for code/branches/buildsystem

Timestamp:

Oct 20, 2008, 5:53:36 PM (16 years ago)

Author:

adrfried

Message:

simplified use of -iquote

Location:

code/branches/buildsystem

Files:

• cmake/UseTolua.cmake (modified) (1 diff)
• src/core/CMakeLists.txt (modified) (1 diff)
• src/orxonox/CMakeLists.txt (modified) (1 diff)

code/branches/buildsystem/cmake/UseTolua.cmake

@@ -19 +19 @@
 GET_TARGET_PROPERTY(TOLUA_EXECUTABLE "${_tolua_executable_name}" LOCATION)
 
-SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -iquote ${CMAKE_CURRENT_SOURCE_DIR} -iquote ${CMAKE_CURRENT_BINARY_DIR}")
-SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -iquote ${CMAKE_CURRENT_SOURCE_DIR} -iquote ${CMAKE_CURRENT_BINARY_DIR}")
+MACRO(INCLUDE_DIRECTORIES_QUOTES)
+  FOREACH(_tolua_quote_dir ${ARGN})
+    SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -iquote ${_tolua_quote_dir}")
+    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -iquote ${_tolua_quote_dir}")
+  ENDFOREACH(_tolua_quote_dir)
+ENDMACRO(INCLUDE_DIRECTORIES_QUOTES)
 
 MACRO(TOLUA _tolua_package _tolua_srcfiles_varname)

code/branches/buildsystem/src/core/CMakeLists.txt

@@ -54 +54 @@
 INCLUDE(UseTolua)
 TOLUA(Core CORE_SRC_FILES INPUTFILES Script.h CommandExecutor.h)
+INCLUDE_DIRECTORIES_QUOTES(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
 
 ADD_LIBRARY(core SHARED ${CORE_SRC_FILES})

code/branches/buildsystem/src/orxonox/CMakeLists.txt

@@ -66 +66 @@
 INCLUDE(UseTolua)
 TOLUA(Orxonox ORXONOX_SRC_FILES INPUTFILES gui/GUIManager.h)
-
-SET(CORE_SUBDIR src/core)
-SET(CORE_SOURCE_DIR "${CMAKE_SOURCE_DIR}/${CORE_SUBDIR}")
-SET(CORE_BINARY_DIR "${CMAKE_BINARY_DIR}/${CORE_SUBDIR}")
-SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -iquote ${CORE_SOURCE_DIR} -iquote ${CORE_BINARY_DIR}")
-SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -iquote ${CORE_SOURCE_DIR} -iquote ${CORE_BINARY_DIR}")
+INCLUDE_DIRECTORIES_QUOTES(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
+INCLUDE_DIRECTORIES_QUOTES("${CMAKE_SOURCE_DIR}/src/core" "${CMAKE_BINARY_DIR}/src/core")
 
 ADD_EXECUTABLE( orxonox ${ORXONOX_SRC_FILES} )