From cade36356dd43f42979a7212c0386febc1ab41c4 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Mon, 3 Mar 2014 16:38:39 -0800 Subject: [PATCH] some more string quoting in cmake files --- cmake/macros/AutoMTC.cmake | 2 +- cmake/macros/IncludeGLM.cmake | 4 ++-- cmake/macros/LinkHifiLibrary.cmake | 4 ++-- cmake/macros/SetupHifiProject.cmake | 6 +++--- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/cmake/macros/AutoMTC.cmake b/cmake/macros/AutoMTC.cmake index f29c3400bb..1c818d9548 100644 --- a/cmake/macros/AutoMTC.cmake +++ b/cmake/macros/AutoMTC.cmake @@ -1,6 +1,6 @@ macro(AUTO_MTC TARGET ROOT_DIR) 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) set(AUTOMTC_SRC ${TARGET}_automtc.cpp) diff --git a/cmake/macros/IncludeGLM.cmake b/cmake/macros/IncludeGLM.cmake index f20f3ef8a8..02116f2d0f 100644 --- a/cmake/macros/IncludeGLM.cmake +++ b/cmake/macros/IncludeGLM.cmake @@ -1,7 +1,7 @@ MACRO(INCLUDE_GLM TARGET ROOT_DIR) - set(GLM_ROOT_DIR ${ROOT_DIR}/externals) + set(GLM_ROOT_DIR "${ROOT_DIR}/externals") find_package(GLM REQUIRED) - include_directories(${GLM_INCLUDE_DIRS}) + include_directories("${GLM_INCLUDE_DIRS}") IF(APPLE OR UNIX) SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -isystem ${GLM_INCLUDE_DIRS}") ENDIF(APPLE OR UNIX) diff --git a/cmake/macros/LinkHifiLibrary.cmake b/cmake/macros/LinkHifiLibrary.cmake index 6a4122d583..925953efcf 100644 --- a/cmake/macros/LinkHifiLibrary.cmake +++ b/cmake/macros/LinkHifiLibrary.cmake @@ -1,9 +1,9 @@ MACRO(LINK_HIFI_LIBRARY LIBRARY TARGET ROOT_DIR) 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}) - include_directories(${ROOT_DIR}/libraries/${LIBRARY}/src) + include_directories("${ROOT_DIR}/libraries/${LIBRARY}/src") add_dependencies(${TARGET} ${LIBRARY}) target_link_libraries(${TARGET} ${LIBRARY}) diff --git a/cmake/macros/SetupHifiProject.cmake b/cmake/macros/SetupHifiProject.cmake index be77d7e244..3b187e6be4 100644 --- a/cmake/macros/SetupHifiProject.cmake +++ b/cmake/macros/SetupHifiProject.cmake @@ -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/*) foreach(DIR ${SRC_SUBDIRS}) - if(IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/src/${DIR}) - FILE(GLOB DIR_CONTENTS src/${DIR}/*) - SET(TARGET_SRCS ${TARGET_SRCS} ${DIR_CONTENTS}) + if(IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/src/${DIR}") + FILE(GLOB DIR_CONTENTS "src/${DIR}/*") + SET(TARGET_SRCS ${TARGET_SRCS} "${DIR_CONTENTS}") endif() endforeach()