Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-07 01:39:23 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

some more string quoting in cmake files

Browse source
This commit is contained in:
Stephen Birarda 2014-03-03 16:38:39 -08:00
parent e16a325006
commit cade36356d
4 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cmake/macros/AutoMTC.cmake
View file

@ -1,6 +1,6 @@
macro(AUTO_MTC TARGET ROOT_DIR) macro(AUTO_MTC TARGET ROOT_DIR)
if (NOT TARGET mtc) if (NOT TARGET mtc)
add_subdirectory(${ROOT_DIR}/tools/mtc ${ROOT_DIR}/tools/mtc) add_subdirectory("${ROOT_DIR}/tools/mtc" "${ROOT_DIR}/tools/mtc")
endif (NOT TARGET mtc) endif (NOT TARGET mtc)
set(AUTOMTC_SRC ${TARGET}_automtc.cpp) set(AUTOMTC_SRC ${TARGET}_automtc.cpp)

4
cmake/macros/IncludeGLM.cmake
View file

@ -1,7 +1,7 @@
MACRO(INCLUDE_GLM TARGET ROOT_DIR) MACRO(INCLUDE_GLM TARGET ROOT_DIR)
set(GLM_ROOT_DIR ${ROOT_DIR}/externals) set(GLM_ROOT_DIR "${ROOT_DIR}/externals")
find_package(GLM REQUIRED) find_package(GLM REQUIRED)
include_directories(${GLM_INCLUDE_DIRS}) include_directories("${GLM_INCLUDE_DIRS}")
IF(APPLE OR UNIX) IF(APPLE OR UNIX)
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -isystem ${GLM_INCLUDE_DIRS}") SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -isystem ${GLM_INCLUDE_DIRS}")
ENDIF(APPLE OR UNIX) ENDIF(APPLE OR UNIX)

4
cmake/macros/LinkHifiLibrary.cmake
View file

@ -1,9 +1,9 @@
MACRO(LINK_HIFI_LIBRARY LIBRARY TARGET ROOT_DIR) MACRO(LINK_HIFI_LIBRARY LIBRARY TARGET ROOT_DIR)
if (NOT TARGET ${LIBRARY}) if (NOT TARGET ${LIBRARY})
add_subdirectory(${ROOT_DIR}/libraries/${LIBRARY} ${ROOT_DIR}/libraries/${LIBRARY}) add_subdirectory("${ROOT_DIR}/libraries/${LIBRARY}" "${ROOT_DIR}/libraries/${LIBRARY}")
endif (NOT TARGET ${LIBRARY}) endif (NOT TARGET ${LIBRARY})
include_directories(${ROOT_DIR}/libraries/${LIBRARY}/src) include_directories("${ROOT_DIR}/libraries/${LIBRARY}/src")
add_dependencies(${TARGET} ${LIBRARY}) add_dependencies(${TARGET} ${LIBRARY})
target_link_libraries(${TARGET} ${LIBRARY}) target_link_libraries(${TARGET} ${LIBRARY})

6
cmake/macros/SetupHifiProject.cmake
View file

@ -6,9 +6,9 @@ macro(SETUP_HIFI_PROJECT TARGET INCLUDE_QT)
file(GLOB SRC_SUBDIRS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}/src ${CMAKE_CURRENT_SOURCE_DIR}/src/*) file(GLOB SRC_SUBDIRS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}/src ${CMAKE_CURRENT_SOURCE_DIR}/src/*)
foreach(DIR ${SRC_SUBDIRS}) foreach(DIR ${SRC_SUBDIRS})
if(IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/src/${DIR}) if(IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/src/${DIR}")
FILE(GLOB DIR_CONTENTS src/${DIR}/*) FILE(GLOB DIR_CONTENTS "src/${DIR}/*")
SET(TARGET_SRCS ${TARGET_SRCS} ${DIR_CONTENTS}) SET(TARGET_SRCS ${TARGET_SRCS} "${DIR_CONTENTS}")
endif() endif()
endforeach() endforeach()