From 4ba1d19dd5c0b3141deeb3affca59a77dac0016f Mon Sep 17 00:00:00 2001 From: Markus Elfring Date: Wed, 2 Apr 2014 21:55:43 +0200 Subject: [PATCH] Bug #1070: Completed quoting for parameters of some CMake commands A wiki article pointed out that whitespace will only be preserved for parameters in CMake commands if passed strings will be appropriately quoted or escaped. http://cmake.org/Wiki/CMake/Language_Syntax#CMake_splits_arguments_unless_you_use_quotation_marks_or_escapes. Quoting was added so that more places should also handle file names correctly which contain space characters or semicolons eventually. Signed-off-by: Markus Elfring --- CMakeLists.txt | 122 ++++++----- cmake/FindHPX_APEX.cmake | 10 +- cmake/FindHPX_BoostAutoIndex.cmake | 4 +- cmake/FindHPX_BoostBook.cmake | 8 +- cmake/FindHPX_BoostQuickBook.cmake | 4 +- cmake/FindHPX_BoostVersion.cmake | 16 +- cmake/FindHPX_BoostWave.cmake | 4 +- cmake/FindHPX_DocBook.cmake | 8 +- cmake/FindHPX_EXODUS.cmake | 4 +- cmake/FindHPX_FOP.cmake | 2 +- cmake/FindHPX_GSL.cmake | 4 +- cmake/FindHPX_HDF5.cmake | 8 +- cmake/FindHPX_Ibverbs.cmake | 4 +- cmake/FindHPX_LORENE.cmake | 6 +- cmake/FindHPX_PAPI.cmake | 2 +- cmake/FindHPX_RNPL.cmake | 2 +- cmake/FindHPX_Rdmacm.cmake | 4 +- cmake/FindHPX_TAU.cmake | 8 +- cmake/FindHPX_TBBmalloc.cmake | 4 +- cmake/FindHPX_Valgrind.cmake | 6 +- cmake/FindHPX_Xsltproc.cmake | 2 +- cmake/FindOpenCL.cmake | 6 +- cmake/HPX_AddComponent.cmake | 74 +++---- cmake/HPX_AddConfigTest.cmake | 44 ++-- cmake/HPX_AddExecutable.cmake | 32 +-- cmake/HPX_AddLibrary.cmake | 74 +++---- cmake/HPX_AddPythonConfigTest.cmake | 2 +- cmake/HPX_AddSourceGroup.cmake | 2 +- cmake/HPX_AddTest.cmake | 2 +- cmake/HPX_Compile.cmake | 10 +- cmake/HPX_Documentation.cmake | 196 ++++++++++-------- cmake/HPX_FindPackage.cmake | 24 +-- cmake/HPX_FindPath.cmake | 6 +- cmake/HPX_FindProgram.cmake | 6 +- cmake/HPX_GCCVersion.cmake | 8 +- cmake/HPX_GFortranVersion.cmake | 6 +- cmake/HPX_GitCommit.cmake | 2 +- cmake/HPX_Install.cmake | 6 +- cmake/HPX_ParseArguments.cmake | 18 +- cmake/HPX_Preprocessing.cmake | 53 ++--- cmake/HPX_SetAllocator.cmake | 12 +- cmake/HPX_SetOutputPaths.cmake | 30 +-- cmake/HPX_UpdateGitDocs.cmake | 42 ++-- docs/CMakeLists.txt | 90 ++++---- examples/interpolate1d/CMakeLists.txt | 3 +- examples/sheneos/CMakeLists.txt | 3 +- plugins/binary_filter/bzip2/CMakeLists.txt | 10 +- plugins/binary_filter/snappy/CMakeLists.txt | 10 +- plugins/binary_filter/zlib/CMakeLists.txt | 10 +- plugins/parcel/coalescing/CMakeLists.txt | 6 +- src/CMakeLists.txt | 91 ++++---- tests/performance/local/CMakeLists.txt | 20 +- .../network/network_storage/CMakeLists.txt | 19 +- 53 files changed, 583 insertions(+), 566 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 51dc9b7d81d0..68774dd0b358 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -59,7 +59,7 @@ endif() ################################################################################ set(HPX_INTERNAL_CMAKE ON) -set(CMAKE_MODULE_PATH ${hpx_SOURCE_DIR}/cmake) +set(CMAKE_MODULE_PATH "${hpx_SOURCE_DIR}/cmake") # include additional macro definitions include(HPX_Utils) @@ -139,10 +139,9 @@ endif() ################################################################################ # search path configuration ################################################################################ -hpx_include_directories(${hpx_SOURCE_DIR}) -hpx_include_directories(${CMAKE_BINARY_DIR}) +hpx_include_directories("${hpx_SOURCE_DIR}" "${CMAKE_BINARY_DIR}") if(${BOOST_MINOR_VERSION} LESS 53) - hpx_include_directories(${hpx_SOURCE_DIR}/external/atomic) + hpx_include_directories("${hpx_SOURCE_DIR}/external/atomic") else() set(BOOST_LIBRARIES ${BOOST_LIBRARIES} atomic) endif() @@ -156,12 +155,12 @@ if(HPX_USE_GENERIC_COROUTINE_CONTEXT) endif() endif() if(${BOOST_MINOR_VERSION} LESS 53) - hpx_include_directories(${hpx_SOURCE_DIR}/external/lockfree) + hpx_include_directories("${hpx_SOURCE_DIR}/external/lockfree") endif() -hpx_include_directories(${hpx_SOURCE_DIR}/external/cache) -hpx_include_directories(${hpx_SOURCE_DIR}/external/endian) +hpx_include_directories("${hpx_SOURCE_DIR}/external/cache" + "${hpx_SOURCE_DIR}/external/endian") if(${BOOST_MINOR_VERSION} LESS 49) - hpx_include_directories(${hpx_SOURCE_DIR}/external/serialization) + hpx_include_directories("${hpx_SOURCE_DIR}/external/serialization") endif() ############################################################################### @@ -176,7 +175,7 @@ hpx_option(HPX_NATIVE_MIC BOOL # Boost headers # FIXME: push changes upstream if(HPX_NATIVE_MIC) - hpx_include_directories(${hpx_SOURCE_DIR}/external/asio) + hpx_include_directories("${hpx_SOURCE_DIR}/external/asio") endif() if(HPX_NATIVE_MIC) @@ -195,9 +194,9 @@ endif() ############################################################################### if(UNIX) - hpx_link_directories(${CMAKE_BINARY_DIR}/lib/hpx) + hpx_link_directories("${CMAKE_BINARY_DIR}/lib/hpx") else() - hpx_link_directories(${CMAKE_BINARY_DIR}/${CMAKE_BUILD_TYPE}/lib/hpx) + hpx_link_directories("${CMAKE_BINARY_DIR}/${CMAKE_BUILD_TYPE}/lib/hpx") endif() ############################################################################### @@ -217,8 +216,8 @@ endif() # ships find_package(HPX_Boost) -hpx_include_sys_directories(${BOOST_INCLUDE_DIR}) -hpx_link_sys_directories(${BOOST_LIBRARY_DIR}) +hpx_include_sys_directories("${BOOST_INCLUDE_DIR}") +hpx_link_sys_directories("${BOOST_LIBRARY_DIR}") if(NOT MSVC) set(hpx_LIBRARIES ${BOOST_FOUND_LIBRARIES}) @@ -687,8 +686,8 @@ endif() if(NOT APPLE) find_package(HPX_Hwloc) if(HWLOC_FOUND) - hpx_include_sys_directories(${HWLOC_INCLUDE_DIR}) - hpx_link_sys_directories(${HWLOC_LIBRARY_DIR}) + hpx_include_sys_directories("${HWLOC_INCLUDE_DIR}") + hpx_link_sys_directories("${HWLOC_LIBRARY_DIR}") hpx_add_definitions(-DHPX_HAVE_HWLOC) set(hpx_RUNTIME_LIBRARIES ${hpx_RUNTIME_LIBRARIES} ${HWLOC_LIBRARY}) endif() @@ -705,8 +704,8 @@ if(SODIUM_FOUND) hpx_add_config_define(HPX_HAVE_SODIUM) - hpx_include_sys_directories(${SODIUM_INCLUDE_DIR}) - hpx_link_sys_directories(${SODIUM_LIBRARY_DIR}) + hpx_include_sys_directories("${SODIUM_INCLUDE_DIR}") + hpx_link_sys_directories("${SODIUM_LIBRARY_DIR}") if(MSVC) hpx_add_config_define(SODIUM_STATIC) endif() @@ -792,8 +791,8 @@ if(HPX_HAVE_ITTNOTIFY) if(AMPLIFIER_FOUND) hpx_info("itt" "Binding to Intel Amplifier tool is enabled.") hpx_add_config_define(HPX_HAVE_ITTNOTIFY 1) - hpx_include_sys_directories(${AMPLIFIER_INCLUDE_DIR}) - hpx_link_sys_directories(${AMPLIFIER_LIBRARY_DIR}) + hpx_include_sys_directories("${AMPLIFIER_INCLUDE_DIR}") + hpx_link_sys_directories("${AMPLIFIER_LIBRARY_DIR}") set(hpx_RUNTIME_LIBRARIES ${hpx_RUNTIME_LIBRARIES} ${AMPLIFIER_LIBRARY}) else() set(HPX_HAVE_ITTNOTIFY OFF FORCE) @@ -962,8 +961,8 @@ if(HPX_GOOGLE_PERFTOOLS) find_package(HPX_GooglePerftools) if(GOOGLE_PERFTOOLS_FOUND) set(hpx_LIBRARIES ${hpx_LIBRARIES} ${GOOGLE_PERFTOOLS_LIBRARY}) - hpx_include_sys_directories(${GOOGLE_PERFTOOLS_INCLUDE_DIR}) - hpx_link_sys_directories(${GOOGLE_PERFTOOLS_LIBRARY_DIR}) + hpx_include_sys_directories("${GOOGLE_PERFTOOLS_INCLUDE_DIR}") + hpx_link_sys_directories("${GOOGLE_PERFTOOLS_LIBRARY_DIR}") hpx_add_config_define(HPX_GOOGLE_PERFTOOLS) endif() endif() @@ -1673,8 +1672,8 @@ foreach(def ${HPX_CONFIG_DEFINITIONS}) endif() endforeach() -configure_file(${hpx_SOURCE_DIR}/cmake/templates/config_defines.hpp.in - ${CMAKE_BINARY_DIR}/hpx/config/defines.hpp +configure_file("${hpx_SOURCE_DIR}/cmake/templates/config_defines.hpp.in" + "${CMAKE_BINARY_DIR}/hpx/config/defines.hpp" @ONLY) ################################################################################ @@ -1693,7 +1692,7 @@ if(NOT HPX_NO_INSTALL) # Install all HPX header that have been configured using various # cmake options install( - DIRECTORY ${CMAKE_BINARY_DIR}/hpx/ + DIRECTORY "${CMAKE_BINARY_DIR}/hpx/" DESTINATION include/hpx COMPONENT core FILES_MATCHING PATTERN "*.hpp" @@ -1848,20 +1847,20 @@ if(NOT HPX_NO_INSTALL) endif() install( - FILES ${hpx_SOURCE_DIR}/LICENSE_1_0.txt + FILES "${hpx_SOURCE_DIR}/LICENSE_1_0.txt" DESTINATION share/hpx-${HPX_VERSION} COMPONENT license) if(HPX_BUILD_DOCUMENTATION) # Install HPX documentation files if(MSVC) - set(doc_dir ${CMAKE_BINARY_DIR}/${CMAKE_BUILD_TYPE}) + set(doc_dir "${CMAKE_BINARY_DIR}/${CMAKE_BUILD_TYPE}") else() - set(doc_dir ${CMAKE_BINARY_DIR}) + set(doc_dir "${CMAKE_BINARY_DIR}") endif() install( - DIRECTORY ${doc_dir}/share/hpx-${HPX_VERSION}/docs/ + DIRECTORY "${doc_dir}/share/hpx-${HPX_VERSION}/docs/" DESTINATION share/hpx-${HPX_VERSION}/docs COMPONENT docs OPTIONAL @@ -1873,16 +1872,16 @@ if(NOT HPX_NO_INSTALL) # DESTINATION ${doc_dir}/share/hpx-${HPX_VERSION}/) install( - FILES ${hpx_SOURCE_DIR}/docs/index.html + FILES "${hpx_SOURCE_DIR}/docs/index.html" DESTINATION share/hpx-${HPX_VERSION}/ COMPONENT docs) -# file(COPY ${hpx_SOURCE_DIR}/docs/html/src/ -# DESTINATION ${doc_dir}/share/hpx-${HPX_VERSION}/docs/html/src +# file(COPY "${hpx_SOURCE_DIR}/docs/html/src/" +# DESTINATION "${doc_dir}/share/hpx-${HPX_VERSION}/docs/html/src" # FILES_MATCHING PATTERN "*.css") install( - DIRECTORY ${hpx_SOURCE_DIR}/docs/html/src/ + DIRECTORY "${hpx_SOURCE_DIR}/docs/html/src/" DESTINATION share/hpx-${HPX_VERSION}/docs/html/src COMPONENT docs FILES_MATCHING PATTERN "*.css" @@ -1893,7 +1892,7 @@ if(NOT HPX_NO_INSTALL) # FILES_MATCHING PATTERN "*.png") install( - DIRECTORY ${hpx_SOURCE_DIR}/docs/html/images/ + DIRECTORY "${hpx_SOURCE_DIR}/docs/html/images/" DESTINATION share/hpx-${HPX_VERSION}/docs/html/images COMPONENT docs FILES_MATCHING PATTERN "*.png" @@ -1905,11 +1904,10 @@ endif() # External build system support (FindHPX.cmake and pkg-config). ################################################################################ set(HPX_LINK_DIRECTORIES - ${CMAKE_INSTALL_PREFIX}/lib/hpx ${HPX_LINK_DIRECTORIES}) + "${CMAKE_INSTALL_PREFIX}/lib/hpx" ${HPX_LINK_DIRECTORIES}) set(HPX_INCLUDE_DIRECTORIES - ${CMAKE_INSTALL_PREFIX}/include ${HPX_INCLUDE_DIRECTORIES}) -set(HPX_INCLUDE_DIRECTORIES - ${CMAKE_INSTALL_PREFIX}/include/hpx/external ${HPX_INCLUDE_DIRECTORIES}) + "${CMAKE_INSTALL_PREFIX}/include" ${HPX_INCLUDE_DIRECTORIES} + "${CMAKE_INSTALL_PREFIX}/include/hpx/external") list(REMOVE_DUPLICATES HPX_LINK_DIRECTORIES) list(REMOVE_DUPLICATES HPX_INCLUDE_DIRECTORIES) @@ -1954,12 +1952,12 @@ list(REMOVE_DUPLICATES external_libraries_name) if(HPX_NO_INSTALL) # foreach(PREFIX ${HPX_PREFIX}) -# list(REMOVE_ITEM HPX_INCLUDE_DIRECTORIES ${PREFIX}/include) -# list(REMOVE_ITEM HPX_INCLUDE_DIRECTORIES ${PREFIX}/include/hpx/external) +# list(REMOVE_ITEM HPX_INCLUDE_DIRECTORIES "${PREFIX}/include)" +# "${PREFIX}/include/hpx/external") # endforeach() else() - list(REMOVE_ITEM HPX_INCLUDE_DIRECTORIES ${hpx_SOURCE_DIR}) - list(REMOVE_ITEM HPX_INCLUDE_DIRECTORIES ${CMAKE_BINARY_DIR}) + list(REMOVE_ITEM HPX_INCLUDE_DIRECTORIES "${hpx_SOURCE_DIR}" + "${CMAKE_BINARY_DIR}") endif() foreach(directory ${HPX_INCLUDE_DIRECTORIES}) @@ -1996,16 +1994,16 @@ list(REMOVE_DUPLICATES external_definitions) set(cmake_dir cmake-${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}) if(MSVC) - set(output_dir ${CMAKE_BINARY_DIR}/${CMAKE_BUILD_TYPE}) + set(output_dir "${CMAKE_BINARY_DIR}/${CMAKE_BUILD_TYPE}") else() - set(output_dir ${CMAKE_BINARY_DIR}) + set(output_dir "${CMAKE_BINARY_DIR}") endif() string(REGEX REPLACE "([ ()])" "\\\\\\1" HPX_PREFIX "${HPX_PREFIX}") if(HPX_NO_INSTALL) - set(external_cmake_path ${hpx_SOURCE_DIR}/cmake) + set(external_cmake_path "${hpx_SOURCE_DIR}/cmake") else() - set(external_cmake_path ${CMAKE_INSTALL_PREFIX}/share/hpx-${HPX_VERSION}/cmake) + set(external_cmake_path "${CMAKE_INSTALL_PREFIX}/share/hpx-${HPX_VERSION}/cmake") endif() set(hpx_link_flag_target_properties "") @@ -2013,42 +2011,42 @@ if(MSVC AND HPX_LINK_FLAG_TARGET_PROPERTIES) set(hpx_link_flag_target_properties "${HPX_LINK_FLAG_TARGET_PROPERTIES}") endif() -configure_file(${hpx_SOURCE_DIR}/cmake/templates/FindHPX.cmake.in - ${output_dir}/share/${cmake_dir}/Modules/FindHPX.cmake +configure_file("${hpx_SOURCE_DIR}/cmake/templates/FindHPX.cmake.in" + "${output_dir}/share/${cmake_dir}/Modules/FindHPX.cmake" ESCAPE_QUOTES @ONLY) if(NOT HPX_NO_INSTALL) - install(FILES ${output_dir}/share/${cmake_dir}/Modules/FindHPX.cmake - DESTINATION share/${cmake_dir}/Modules) + install(FILES "${output_dir}/share/${cmake_dir}/Modules/FindHPX.cmake" + DESTINATION "share/${cmake_dir}/Modules") endif() if(NOT ("${CMAKE_BUILD_TYPE}" STREQUAL "Debug")) - configure_file(${hpx_SOURCE_DIR}/cmake/templates/hpx_application.pc.in - ${output_dir}/lib/pkgconfig/hpx_application.pc + configure_file("${hpx_SOURCE_DIR}/cmake/templates/hpx_application.pc.in" + "${output_dir}/lib/pkgconfig/hpx_application.pc" @ONLY) - configure_file(${hpx_SOURCE_DIR}/cmake/templates/hpx_component.pc.in - ${output_dir}/lib/pkgconfig/hpx_component.pc + configure_file("${hpx_SOURCE_DIR}/cmake/templates/hpx_component.pc.in" + "${output_dir}/lib/pkgconfig/hpx_component.pc" @ONLY) else() - configure_file(${hpx_SOURCE_DIR}/cmake/templates/hpx_application_debug.pc.in - ${output_dir}/lib/pkgconfig/hpx_application_debug.pc + configure_file("${hpx_SOURCE_DIR}/cmake/templates/hpx_application_debug.pc.in" + "${output_dir}/lib/pkgconfig/hpx_application_debug.pc" @ONLY) - configure_file(${hpx_SOURCE_DIR}/cmake/templates/hpx_component_debug.pc.in - ${output_dir}/lib/pkgconfig/hpx_component_debug.pc + configure_file("${hpx_SOURCE_DIR}/cmake/templates/hpx_component_debug.pc.in" + "${output_dir}/lib/pkgconfig/hpx_component_debug.pc" @ONLY) endif() if(NOT HPX_NO_INSTALL) if(NOT ("${CMAKE_BUILD_TYPE}" STREQUAL "Debug")) - install(FILES ${output_dir}/lib/pkgconfig/hpx_application.pc + install(FILES "${output_dir}/lib/pkgconfig/hpx_application.pc" DESTINATION lib/pkgconfig) - install(FILES ${output_dir}/lib/pkgconfig/hpx_component.pc + install(FILES "${output_dir}/lib/pkgconfig/hpx_component.pc" DESTINATION lib/pkgconfig) else() - install(FILES ${output_dir}/lib/pkgconfig/hpx_application_debug.pc + install(FILES "${output_dir}/lib/pkgconfig/hpx_application_debug.pc" DESTINATION lib/pkgconfig) - install(FILES ${output_dir}/lib/pkgconfig/hpx_component_debug.pc + install(FILES "${output_dir}/lib/pkgconfig/hpx_component_debug.pc" DESTINATION lib/pkgconfig) endif() endif() @@ -2056,4 +2054,4 @@ endif() # Create a symlink in share pointing to the latest HPX installation execute_process(COMMAND "${CMAKE_COMMAND}" -E create_symlink "hpx-${HPX_VERSION}" "hpx" - WORKING_DIRECTORY ${output_dir}/share) + WORKING_DIRECTORY "${output_dir}/share") diff --git a/cmake/FindHPX_APEX.cmake b/cmake/FindHPX_APEX.cmake index 3798f185994f..1ed93841bd46 100644 --- a/cmake/FindHPX_APEX.cmake +++ b/cmake/FindHPX_APEX.cmake @@ -12,10 +12,10 @@ endif() # This if statement is specific to APEX, and should not be copied into other # Find cmake scripts. if(NOT APEX_ROOT AND NOT $ENV{HOME_APEX} STREQUAL "") - set(APEX_ROOT $ENV{HOME_APEX}) + set(APEX_ROOT "$ENV{HOME_APEX}") endif() if(NOT APEX_ROOT AND NOT $ENV{APEX_ROOT} STREQUAL "") - set(APEX_ROOT $ENV{APEX_ROOT}) + set(APEX_ROOT "$ENV{APEX_ROOT}") endif() # Need to add -L$(APEX_ROOT)/x86_64/lib -lApex @@ -28,13 +28,13 @@ hpx_find_package(APEX if(APEX_FOUND) set(hpx_RUNTIME_LIBRARIES ${hpx_RUNTIME_LIBRARIES} ${APEX_LIBRARY}) - hpx_include_sys_directories(${APEX_INCLUDE_DIR}) - hpx_link_sys_directories(${APEX_LIBRARY_DIR}) + hpx_include_sys_directories("${APEX_INCLUDE_DIR}") + hpx_link_sys_directories("${APEX_LIBRARY_DIR}") hpx_add_config_define(HPX_HAVE_APEX) # APEX can support the amplifier interface, so enable that, too if(NOT AMPLIFIER_ROOT) - set(AMPLIFIER_ROOT ${APEX_ROOT}) + set(AMPLIFIER_ROOT "${APEX_ROOT}") set(HPX_HAVE_ITTNOTIFY ON) endif() endif() diff --git a/cmake/FindHPX_BoostAutoIndex.cmake b/cmake/FindHPX_BoostAutoIndex.cmake index feb8bda9df82..9c09e9429ad7 100644 --- a/cmake/FindHPX_BoostAutoIndex.cmake +++ b/cmake/FindHPX_BoostAutoIndex.cmake @@ -10,9 +10,9 @@ endif() if(NOT BOOSTAUTOINDEX_ROOT) if(BOOST_ROOT) - set(BOOSTAUTOINDEX_ROOT ${BOOST_ROOT}) + set(BOOSTAUTOINDEX_ROOT "${BOOST_ROOT}") elseif($ENV{BOOST_ROOT}) - set(BOOSTAUTOINDEX_ROOT $ENV{BOOST_ROOT}) + set(BOOSTAUTOINDEX_ROOT "$ENV{BOOST_ROOT}") endif() endif() diff --git a/cmake/FindHPX_BoostBook.cmake b/cmake/FindHPX_BoostBook.cmake index 2c932e19250f..67a436d774ba 100644 --- a/cmake/FindHPX_BoostBook.cmake +++ b/cmake/FindHPX_BoostBook.cmake @@ -14,15 +14,15 @@ endif() if(NOT BOOSTBOOK_ROOT) if(BOOST_ROOT) - set(BOOSTBOOK_ROOT ${BOOST_ROOT}) + set(BOOSTBOOK_ROOT "${BOOST_ROOT}") elseif($ENV{BOOST_ROOT}) - set(BOOSTBOOK_ROOT $ENV{BOOST_ROOT}) + set(BOOSTBOOK_ROOT "$ENV{BOOST_ROOT}") endif() endif() if(BOOSTBOOK_ROOT) - set(BOOSTBOOK_DTD_ROOT ${BOOSTBOOK_ROOT}) - set(BOOSTBOOK_XSL_ROOT ${BOOSTBOOK_ROOT}) + set(BOOSTBOOK_DTD_ROOT "${BOOSTBOOK_ROOT}") + set(BOOSTBOOK_XSL_ROOT "${BOOSTBOOK_ROOT}") endif() hpx_find_path(BOOSTBOOK_DTD diff --git a/cmake/FindHPX_BoostQuickBook.cmake b/cmake/FindHPX_BoostQuickBook.cmake index 7927b1e76b40..ecab4aa428df 100644 --- a/cmake/FindHPX_BoostQuickBook.cmake +++ b/cmake/FindHPX_BoostQuickBook.cmake @@ -13,9 +13,9 @@ endif() if(NOT BOOSTQUICKBOOK_ROOT) if(BOOST_ROOT) - set(BOOSTQUICKBOOK_ROOT ${BOOST_ROOT}) + set(BOOSTQUICKBOOK_ROOT "${BOOST_ROOT}") elseif($ENV{BOOST_ROOT}) - set(BOOSTQUICKBOOK_ROOT $ENV{BOOST_ROOT}) + set(BOOSTQUICKBOOK_ROOT "$ENV{BOOST_ROOT}") endif() endif() diff --git a/cmake/FindHPX_BoostVersion.cmake b/cmake/FindHPX_BoostVersion.cmake index ef2c8c12ca38..84b8e31b2689 100644 --- a/cmake/FindHPX_BoostVersion.cmake +++ b/cmake/FindHPX_BoostVersion.cmake @@ -14,16 +14,16 @@ macro(get_boost_version) if(NOT BOOST_USE_SYSTEM) if(NOT BOOST_ROOT) if(NOT $ENV{BOOST_ROOT} STREQUAL "") - set(BOOST_ROOT $ENV{BOOST_ROOT}) + set(BOOST_ROOT "$ENV{BOOST_ROOT}") elseif(NOT $ENV{BOOST} STREQUAL "") - set(BOOST_ROOT $ENV{BOOST}) + set(BOOST_ROOT "$ENV{BOOST}") endif() endif() if(NOT BOOST_LIBRARY_DIR AND BOOST_ROOT) - find_path(BOOST_LIBRARY_DIR lib PATHS ${BOOST_ROOT}/stage64 ${BOOST_ROOT}/stage ${BOOST_ROOT} NO_DEFAULT_PATH) + find_path(BOOST_LIBRARY_DIR lib PATHS "${BOOST_ROOT}/stage64" "${BOOST_ROOT}/stage" "${BOOST_ROOT}" NO_DEFAULT_PATH) if(${BOOST_LIBRARY_DIR} STREQUAL BOOST_LIBRARY_DIR-NOTFOUND) - find_path(BOOST_LIBRARY_DIR lib64 PATHS ${BOOST_ROOT}/stage64 ${BOOST_ROOT}/stage ${BOOST_ROOT} NO_DEFAULT_PATH) + find_path(BOOST_LIBRARY_DIR lib64 PATHS "${BOOST_ROOT}/stage64" "${BOOST_ROOT}/stage" "${BOOST_ROOT}" NO_DEFAULT_PATH) if(${BOOST_LIBRARY_DIR} STREQUAL BOOST_LIBRARY_DIR-NOTFOUND) set(BOOST_LIBRARY_DIR "${BOOST_LIBRARY_DIR}/lib64" ) endif() @@ -34,11 +34,11 @@ macro(get_boost_version) endif() if(NOT BOOST_INCLUDE_DIR AND BOOST_ROOT) - find_path(BOOST_INCLUDE_DIR boost PATHS ${BOOST_ROOT} ${BOOST_ROOT}/include NO_DEFAULT_PATH) + find_path(BOOST_INCLUDE_DIR boost PATHS "${BOOST_ROOT}" "${BOOST_ROOT}/include" NO_DEFAULT_PATH) endif() # Locate include directory - find_path(BOOST_VERSION_HPP boost/version.hpp PATHS ${BOOST_INCLUDE_DIR} NO_DEFAULT_PATH) + find_path(BOOST_VERSION_HPP boost/version.hpp PATHS "${BOOST_INCLUDE_DIR}" NO_DEFAULT_PATH) if(${BOOST_VERSION_HPP} STREQUAL BOOST_VERSION_HPP-NOTFOUND) set(boost_possible_suffixes @@ -54,7 +54,7 @@ macro(get_boost_version) endif() find_path(BOOST_VERSION_HPP boost/version.hpp - PATHS ${BOOST_INCLUDE_DIR} + PATHS "${BOOST_INCLUDE_DIR}" PATH_SUFFIXES ${boost_possible_suffixes} NO_DEFAULT_PATH) @@ -92,7 +92,7 @@ macro(get_boost_version) endif() - set(BOOST_VERSION_HPP ${BOOST_VERSION_HPP}/boost/version.hpp) + set(BOOST_VERSION_HPP "${BOOST_VERSION_HPP}/boost/version.hpp") hpx_info("boost.version" "Using ${BOOST_VERSION_HPP} as Boost version.hpp header.") # Get Boost version diff --git a/cmake/FindHPX_BoostWave.cmake b/cmake/FindHPX_BoostWave.cmake index 6c834345bbe8..4ebf4be24d19 100644 --- a/cmake/FindHPX_BoostWave.cmake +++ b/cmake/FindHPX_BoostWave.cmake @@ -10,9 +10,9 @@ endif() if(NOT BOOSTWAVE_ROOT) if(BOOST_ROOT) - set(BOOSTWAVE_ROOT ${BOOST_ROOT}) + set(BOOSTWAVE_ROOT "${BOOST_ROOT}") elseif($ENV{BOOST_ROOT}) - set(BOOSTWAVE_ROOT $ENV{BOOST_ROOT}) + set(BOOSTWAVE_ROOT "$ENV{BOOST_ROOT}") endif() endif() diff --git a/cmake/FindHPX_DocBook.cmake b/cmake/FindHPX_DocBook.cmake index 5cdaeee14aba..aa7345e096d2 100644 --- a/cmake/FindHPX_DocBook.cmake +++ b/cmake/FindHPX_DocBook.cmake @@ -13,11 +13,11 @@ if(DOCBOOK_USE_SYSTEM) endif() if(DOCBOOK_ROOT) - set(DOCBOOK_DTD_ROOT ${DOCBOOK_ROOT}) - set(DOCBOOK_XSL_ROOT ${DOCBOOK_ROOT}) + set(DOCBOOK_DTD_ROOT "${DOCBOOK_ROOT}") + set(DOCBOOK_XSL_ROOT "${DOCBOOK_ROOT}") elseif(DEFINED ENV{DOCBOOK_ROOT}) - set(DOCBOOK_DTD_ROOT $ENV{DOCBOOK_ROOT}) - set(DOCBOOK_XSL_ROOT $ENV{DOCBOOK_ROOT}) + set(DOCBOOK_DTD_ROOT "$ENV{DOCBOOK_ROOT}") + set(DOCBOOK_XSL_ROOT "$ENV{DOCBOOK_ROOT}") endif() hpx_find_path(DOCBOOK_DTD diff --git a/cmake/FindHPX_EXODUS.cmake b/cmake/FindHPX_EXODUS.cmake index 0013964782ca..d39baea22256 100644 --- a/cmake/FindHPX_EXODUS.cmake +++ b/cmake/FindHPX_EXODUS.cmake @@ -14,11 +14,11 @@ hpx_find_package(EXODUS HEADER_PATHS include cbind/include) if($ENV{EXODUS_ROOT}) - set(EXODUS_FORTRAN_ROOT $ENV{EXODUS_ROOT}) + set(EXODUS_FORTRAN_ROOT "$ENV{EXODUS_ROOT}") endif() if(EXODUS_ROOT) - set(EXODUS_FORTRAN_ROOT ${EXODUS_ROOT}) + set(EXODUS_FORTRAN_ROOT "${EXODUS_ROOT}") endif() hpx_find_package(EXODUS_FORTRAN diff --git a/cmake/FindHPX_FOP.cmake b/cmake/FindHPX_FOP.cmake index 2f64ed989f8f..d4ba64a48095 100644 --- a/cmake/FindHPX_FOP.cmake +++ b/cmake/FindHPX_FOP.cmake @@ -9,7 +9,7 @@ endif() if(NOT FOP_ROOT) if($ENV{FOP_ROOT}) - set(FOP_ROOT $ENV{FOP_ROOT}) + set(FOP_ROOT "$ENV{FOP_ROOT}") endif() endif() diff --git a/cmake/FindHPX_GSL.cmake b/cmake/FindHPX_GSL.cmake index 49f40d99ccca..ccb8295f0d6f 100644 --- a/cmake/FindHPX_GSL.cmake +++ b/cmake/FindHPX_GSL.cmake @@ -11,7 +11,7 @@ endif() # This if statement is specific to GSL, and should not be copied into other # Find cmake scripts. if(NOT GSL_ROOT AND NOT $ENV{HOME_GSL} STREQUAL "") - set(GSL_ROOT $ENV{HOME_GSL}) + set(GSL_ROOT "$ENV{HOME_GSL}") endif() if(GSL_USE_SYSTEM) @@ -19,7 +19,7 @@ if(GSL_USE_SYSTEM) endif() if(GSL_ROOT) - set(GSLCBLAS_ROOT ${GSL_ROOT}) + set(GSLCBLAS_ROOT "${GSL_ROOT}") endif() hpx_find_package(GSL diff --git a/cmake/FindHPX_HDF5.cmake b/cmake/FindHPX_HDF5.cmake index cf033d24d662..e8382f4d3564 100644 --- a/cmake/FindHPX_HDF5.cmake +++ b/cmake/FindHPX_HDF5.cmake @@ -17,19 +17,19 @@ endif() if($ENV{HDF5_ROOT}) if(NOT HDF5_CPP_ROOT) - set(HDF5_CPP_ROOT $ENV{HDF5_ROOT}) + set(HDF5_CPP_ROOT "$ENV{HDF5_ROOT}") endif() if(NOT HDF5_FORTRAN_ROOT) - set(HDF5_FORTRAN_ROOT $ENV{HDF5_ROOT}) + set(HDF5_FORTRAN_ROOT "$ENV{HDF5_ROOT}") endif() endif() if(HDF5_ROOT) if(NOT HDF5_CPP_ROOT) - set(HDF5_CPP_ROOT ${HDF5_ROOT}) + set(HDF5_CPP_ROOT "${HDF5_ROOT}") endif() if(NOT HDF5_FORTRAN_ROOT) - set(HDF5_FORTRAN_ROOT ${HDF5_ROOT}) + set(HDF5_FORTRAN_ROOT "${HDF5_ROOT}") endif() endif() diff --git a/cmake/FindHPX_Ibverbs.cmake b/cmake/FindHPX_Ibverbs.cmake index da48ba19c518..a5c3fccd76b1 100644 --- a/cmake/FindHPX_Ibverbs.cmake +++ b/cmake/FindHPX_Ibverbs.cmake @@ -17,7 +17,7 @@ hpx_find_package(IBVERBS if(IBVERBS_FOUND) set(hpx_RUNTIME_LIBRARIES ${hpx_RUNTIME_LIBRARIES} ${IBVERBS_LIBRARY}) - hpx_include_sys_directories(${IBVERBS_INCLUDE_DIR}) - hpx_link_sys_directories(${IBVERBS_LIBRARY_DIR}) + hpx_include_sys_directories("${IBVERBS_INCLUDE_DIR}") + hpx_link_sys_directories("${IBVERBS_LIBRARY_DIR}") hpx_add_config_define(HPX_HAVE_IBVERBS) endif() diff --git a/cmake/FindHPX_LORENE.cmake b/cmake/FindHPX_LORENE.cmake index 4463252e348d..bb27a5a486d3 100644 --- a/cmake/FindHPX_LORENE.cmake +++ b/cmake/FindHPX_LORENE.cmake @@ -11,7 +11,7 @@ endif() # This if statement is specific to Lorene, and should not be copied into other # Find cmake scripts. if(NOT LORENE_ROOT AND NOT $ENV{HOME_LORENE} STREQUAL "") - set(LORENE_ROOT $ENV{HOME_LORENE}) + set(LORENE_ROOT "$ENV{HOME_LORENE}") endif() if(LORENE_USE_SYSTEM) @@ -19,7 +19,7 @@ if(LORENE_USE_SYSTEM) endif() if(LORENE_ROOT) - set(LORENE_F77_ROOT ${LORENE_ROOT}) + set(LORENE_F77_ROOT "${LORENE_ROOT}") endif() if(LORENE_USE_SYSTEM) @@ -27,7 +27,7 @@ if(LORENE_USE_SYSTEM) endif() if(LORENE_ROOT) - set(LORENE_EXPORT_ROOT ${LORENE_ROOT}) + set(LORENE_EXPORT_ROOT "${LORENE_ROOT}") endif() hpx_find_package(LORENE diff --git a/cmake/FindHPX_PAPI.cmake b/cmake/FindHPX_PAPI.cmake index 1f24251b0e05..173584850542 100644 --- a/cmake/FindHPX_PAPI.cmake +++ b/cmake/FindHPX_PAPI.cmake @@ -12,7 +12,7 @@ endif() # This if statement is specific to PAPI, and should not be copied into other # Find cmake scripts. if(NOT PAPI_ROOT AND NOT $ENV{HOME_PAPI} STREQUAL "") - set(PAPI_ROOT $ENV{HOME_PAPI}) + set(PAPI_ROOT "$ENV{HOME_PAPI}") endif() hpx_find_package(PAPI diff --git a/cmake/FindHPX_RNPL.cmake b/cmake/FindHPX_RNPL.cmake index 201ee8d6a571..f333eab57092 100644 --- a/cmake/FindHPX_RNPL.cmake +++ b/cmake/FindHPX_RNPL.cmake @@ -10,7 +10,7 @@ if(NOT HPX_FINDPACKAGE_LOADED) endif() if(NOT SDF_ROOT AND NOT $ENV{SDF_ROOT} STREQUAL "") - set(SDF_ROOT $ENV{SDF_ROOT}) + set(SDF_ROOT "$ENV{SDF_ROOT}") endif() if(SDF_ROOT) diff --git a/cmake/FindHPX_Rdmacm.cmake b/cmake/FindHPX_Rdmacm.cmake index 9b5db9de930c..fd6add63b051 100644 --- a/cmake/FindHPX_Rdmacm.cmake +++ b/cmake/FindHPX_Rdmacm.cmake @@ -17,7 +17,7 @@ hpx_find_package(RDMACM if(RDMACM_FOUND) set(hpx_RUNTIME_LIBRARIES ${hpx_RUNTIME_LIBRARIES} ${RDMACM_LIBRARY}) - hpx_include_sys_directories(${RDMACM_INCLUDE_DIR}) - hpx_link_sys_directories(${RDMACM_LIBRARY_DIR}) + hpx_include_sys_directories("${RDMACM_INCLUDE_DIR}") + hpx_link_sys_directories("${RDMACM_LIBRARY_DIR}") hpx_add_config_define(HPX_HAVE_RDMACM) endif() diff --git a/cmake/FindHPX_TAU.cmake b/cmake/FindHPX_TAU.cmake index e6e0deeb3c2d..e10da4a8be07 100644 --- a/cmake/FindHPX_TAU.cmake +++ b/cmake/FindHPX_TAU.cmake @@ -12,7 +12,7 @@ endif() # This if statement is specific to TAU, and should not be copied into other # Find cmake scripts. if(NOT TAU_ROOT AND NOT $ENV{HOME_TAU} STREQUAL "") - set(TAU_ROOT $ENV{HOME_TAU}) + set(TAU_ROOT "$ENV{HOME_TAU}") endif() # Need to add -L$(TAU_ROOT)/x86_64/lib -lTAU @@ -24,8 +24,8 @@ hpx_find_package(TAU HEADER_PATHS include) if(TAU_FOUND) - set(hpx_RUNTIME_LIBRARIES ${hpx_RUNTIME_LIBRARIES} ${TAU_LIBRARY}) - hpx_include_sys_directories(${TAU_INCLUDE_DIR}) - hpx_link_sys_directories(${TAU_LIBRARY_DIR}) + set(hpx_RUNTIME_LIBRARIES ${hpx_RUNTIME_LIBRARIES} "${TAU_LIBRARY}") + hpx_include_sys_directories("${TAU_INCLUDE_DIR}") + hpx_link_sys_directories("${TAU_LIBRARY_DIR}") hpx_add_config_define(HPX_HAVE_TAU) endif() diff --git a/cmake/FindHPX_TBBmalloc.cmake b/cmake/FindHPX_TBBmalloc.cmake index bd4ed064d834..4e3a794bb822 100644 --- a/cmake/FindHPX_TBBmalloc.cmake +++ b/cmake/FindHPX_TBBmalloc.cmake @@ -9,11 +9,11 @@ if(NOT HPX_FINDPACKAGE_LOADED) endif() if(TBB_ROOT AND NOT TBBMALLOC_ROOT) - set(TBBMALLOC_ROOT ${TBB_ROOT}) + set(TBBMALLOC_ROOT "${TBB_ROOT}") endif() if(TBBMALLOC_ROOT AND NOT TBBMALLOC_PROXY_ROOT) - set(TBBMALLOC_PROXY_ROOT ${TBBMALLOC_ROOT}) + set(TBBMALLOC_PROXY_ROOT "${TBBMALLOC_ROOT}") endif() set(TBBMALLOC_LIB_SEARCH_PATH "") diff --git a/cmake/FindHPX_Valgrind.cmake b/cmake/FindHPX_Valgrind.cmake index 027b757f18de..b49777afde5b 100644 --- a/cmake/FindHPX_Valgrind.cmake +++ b/cmake/FindHPX_Valgrind.cmake @@ -11,10 +11,10 @@ if(HPX_HAVE_VALGRIND) endif() if(NOT VALGRIND_ROOT AND NOT $ENV{HOME_VALGRIND} STREQUAL "") - set(VALGRIND_ROOT $ENV{HOME_VALGRIND}) + set(VALGRIND_ROOT "$ENV{HOME_VALGRIND}") endif() if(NOT VALGRIND_ROOT AND NOT $ENV{VALGRIND_ROOT} STREQUAL "") - set(VALGRIND_ROOT $ENV{VALGRIND_ROOT}) + set(VALGRIND_ROOT "$ENV{VALGRIND_ROOT}") endif() @@ -23,7 +23,7 @@ if(HPX_HAVE_VALGRIND) HEADER_PATHS include) if(VALGRIND_INCLUDE_DIR) - hpx_include_sys_directories(${VALGRIND_INCLUDE_DIR}) + hpx_include_sys_directories("${VALGRIND_INCLUDE_DIR}") hpx_add_config_define(HPX_HAVE_VALGRIND) endif() endif() diff --git a/cmake/FindHPX_Xsltproc.cmake b/cmake/FindHPX_Xsltproc.cmake index 1b5895f1e582..cd7230caedb0 100644 --- a/cmake/FindHPX_Xsltproc.cmake +++ b/cmake/FindHPX_Xsltproc.cmake @@ -9,7 +9,7 @@ endif() if(NOT XSLTPROC_ROOT) if($ENV{XSLTPROC_ROOT}) - set(XSLTPROC_ROOT $ENV{XSLTPROC_ROOT}) + set(XSLTPROC_ROOT "$ENV{XSLTPROC_ROOT}") endif() endif() diff --git a/cmake/FindOpenCL.cmake b/cmake/FindOpenCL.cmake index 494fa6002a08..db401919b450 100644 --- a/cmake/FindOpenCL.cmake +++ b/cmake/FindOpenCL.cmake @@ -32,8 +32,8 @@ ELSE (APPLE) ELSE (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "AMD64") SET(OPENCL_LIB_DIR "$ENV{ATISTREAMSDKROOT}/lib/x86") ENDIF( ${CMAKE_SYSTEM_PROCESSOR} STREQUAL "AMD64" ) - FIND_LIBRARY(OPENCL_LIBRARIES OpenCL.lib PATHS ${OPENCL_LIB_DIR} ENV OpenCL_LIBPATH) - GET_FILENAME_COMPONENT(_OPENCL_INC_CAND ${OPENCL_LIB_DIR}/../../include ABSOLUTE) + FIND_LIBRARY(OPENCL_LIBRARIES OpenCL.lib PATHS "${OPENCL_LIB_DIR}" ENV OpenCL_LIBPATH) + GET_FILENAME_COMPONENT(_OPENCL_INC_CAND "${OPENCL_LIB_DIR}/../../include" ABSOLUTE) # On Win32 search relative to the library FIND_PATH(OPENCL_INCLUDE_DIRS CL/cl.h PATHS "${_OPENCL_INC_CAND}" ENV OpenCL_INCPATH) FIND_PATH(_OPENCL_CPP_INCLUDE_DIRS CL/cl.hpp PATHS "${_OPENCL_INC_CAND}" ENV OpenCL_INCPATH) @@ -43,7 +43,7 @@ ELSE (APPLE) PATHS ENV LD_LIBRARY_PATH ENV OpenCL_LIBPATH ) GET_FILENAME_COMPONENT(OPENCL_LIB_DIR ${OPENCL_LIBRARIES} PATH) - GET_FILENAME_COMPONENT(_OPENCL_INC_CAND ${OPENCL_LIB_DIR}/../../include ABSOLUTE) + GET_FILENAME_COMPONENT(_OPENCL_INC_CAND "${OPENCL_LIB_DIR}/../../include" ABSOLUTE) # The AMD SDK currently does not place its headers # in /usr/include, therefore also search relative # to the library diff --git a/cmake/HPX_AddComponent.cmake b/cmake/HPX_AddComponent.cmake index a61f0af1311f..ec777b7d2765 100644 --- a/cmake/HPX_AddComponent.cmake +++ b/cmake/HPX_AddComponent.cmake @@ -171,45 +171,45 @@ macro(add_hpx_component name) if(HPX_SET_OUTPUT_PATH AND NOT ${name}_OUTPUT_SUFFIX) if(MSVC) - set_target_properties(${name}_component PROPERTIES - RUNTIME_OUTPUT_DIRECTORY_RELEASE ${HPX_LIBRARY_OUTPUT_DIRECTORY_RELEASE} - RUNTIME_OUTPUT_DIRECTORY_DEBUG ${HPX_LIBRARY_OUTPUT_DIRECTORY_DEBUG} - RUNTIME_OUTPUT_DIRECTORY_MINSIZEREL ${HPX_LIBRARY_OUTPUT_DIRECTORY_MINSIZEREL} - RUNTIME_OUTPUT_DIRECTORY_RELWITHDEBINFO ${HPX_LIBRARY_OUTPUT_DIRECTORY_RELWITHDEBINFO} - ARCHIVE_OUTPUT_DIRECTORY_RELEASE ${HPX_ARCHIVE_OUTPUT_DIRECTORY_RELEASE} - ARCHIVE_OUTPUT_DIRECTORY_DEBUG ${HPX_ARCHIVE_OUTPUT_DIRECTORY_DEBUG} - ARCHIVE_OUTPUT_DIRECTORY_MINSIZEREL ${HPX_ARCHIVE_OUTPUT_DIRECTORY_MINSIZEREL} - ARCHIVE_OUTPUT_DIRECTORY_RELWITHDEBINFO ${HPX_ARCHIVE_OUTPUT_DIRECTORY_RELWITHDEBINFO} - LIBRARY_OUTPUT_DIRECTORY_RELEASE ${HPX_LIBRARY_OUTPUT_DIRECTORY_RELEASE} - LIBRARY_OUTPUT_DIRECTORY_DEBUG ${HPX_LIBRARY_OUTPUT_DIRECTORY_DEBUG} - LIBRARY_OUTPUT_DIRECTORY_MINSIZEREL ${HPX_LIBRARY_OUTPUT_DIRECTORY_MINSIZEREL} - LIBRARY_OUTPUT_DIRECTORY_RELWITHDEBINFO ${HPX_LIBRARY_OUTPUT_DIRECTORY_RELWITHDEBINFO}) + set_target_properties("${name}_component" PROPERTIES + RUNTIME_OUTPUT_DIRECTORY_RELEASE "${HPX_LIBRARY_OUTPUT_DIRECTORY_RELEASE}" + RUNTIME_OUTPUT_DIRECTORY_DEBUG "${HPX_LIBRARY_OUTPUT_DIRECTORY_DEBUG}" + RUNTIME_OUTPUT_DIRECTORY_MINSIZEREL "${HPX_LIBRARY_OUTPUT_DIRECTORY_MINSIZEREL}" + RUNTIME_OUTPUT_DIRECTORY_RELWITHDEBINFO "${HPX_LIBRARY_OUTPUT_DIRECTORY_RELWITHDEBINFO}" + ARCHIVE_OUTPUT_DIRECTORY_RELEASE "${HPX_ARCHIVE_OUTPUT_DIRECTORY_RELEASE}" + ARCHIVE_OUTPUT_DIRECTORY_DEBUG "${HPX_ARCHIVE_OUTPUT_DIRECTORY_DEBUG}" + ARCHIVE_OUTPUT_DIRECTORY_MINSIZEREL "${HPX_ARCHIVE_OUTPUT_DIRECTORY_MINSIZEREL}" + ARCHIVE_OUTPUT_DIRECTORY_RELWITHDEBINFO "${HPX_ARCHIVE_OUTPUT_DIRECTORY_RELWITHDEBINFO}" + LIBRARY_OUTPUT_DIRECTORY_RELEASE "${HPX_LIBRARY_OUTPUT_DIRECTORY_RELEASE}" + LIBRARY_OUTPUT_DIRECTORY_DEBUG "${HPX_LIBRARY_OUTPUT_DIRECTORY_DEBUG}" + LIBRARY_OUTPUT_DIRECTORY_MINSIZEREL "${HPX_LIBRARY_OUTPUT_DIRECTORY_MINSIZEREL}" + LIBRARY_OUTPUT_DIRECTORY_RELWITHDEBINFO "${HPX_LIBRARY_OUTPUT_DIRECTORY_RELWITHDEBINFO}") else() - set_target_properties(${name}_component PROPERTIES - RUNTIME_OUTPUT_DIRECTORY ${HPX_LIBRARY_OUTPUT_DIRECTORY} - ARCHIVE_OUTPUT_DIRECTORY ${HPX_LIBRARY_OUTPUT_DIRECTORY} - LIBRARY_OUTPUT_DIRECTORY ${HPX_LIBRARY_OUTPUT_DIRECTORY}) + set_target_properties("${name}_component" PROPERTIES + RUNTIME_OUTPUT_DIRECTORY "${HPX_LIBRARY_OUTPUT_DIRECTORY}" + ARCHIVE_OUTPUT_DIRECTORY "${HPX_LIBRARY_OUTPUT_DIRECTORY}" + LIBRARY_OUTPUT_DIRECTORY "${HPX_LIBRARY_OUTPUT_DIRECTORY}") endif() elseif(${name}_OUTPUT_SUFFIX) if(MSVC) - set_target_properties(${name}_component PROPERTIES - RUNTIME_OUTPUT_DIRECTORY_RELEASE ${CMAKE_BINARY_DIR}/Release/${${name}_OUTPUT_SUFFIX} - RUNTIME_OUTPUT_DIRECTORY_DEBUG ${CMAKE_BINARY_DIR}/Debug/${${name}_OUTPUT_SUFFIX} - RUNTIME_OUTPUT_DIRECTORY_MINSIZEREL ${CMAKE_BINARY_DIR}/MinSizeRel/${${name}_OUTPUT_SUFFIX} - RUNTIME_OUTPUT_DIRECTORY_RELWITHDEBINFO ${CMAKE_BINARY_DIR}/RelWithDebInfo/${${name}_OUTPUT_SUFFIX} - ARCHIVE_OUTPUT_DIRECTORY_RELEASE ${CMAKE_BINARY_DIR}/Release/${${name}_OUTPUT_SUFFIX} - ARCHIVE_OUTPUT_DIRECTORY_DEBUG ${CMAKE_BINARY_DIR}/Debug/${${name}_OUTPUT_SUFFIX} - ARCHIVE_OUTPUT_DIRECTORY_MINSIZEREL ${CMAKE_BINARY_DIR}/MinSizeRel/${${name}_OUTPUT_SUFFIX} - ARCHIVE_OUTPUT_DIRECTORY_RELWITHDEBINFO ${CMAKE_BINARY_DIR}/RelWithDebInfo/${${name}_OUTPUT_SUFFIX} - LIBRARY_OUTPUT_DIRECTORY_RELEASE ${CMAKE_BINARY_DIR}/Release/${${name}_OUTPUT_SUFFIX} - LIBRARY_OUTPUT_DIRECTORY_DEBUG ${CMAKE_BINARY_DIR}/Debug/${${name}_OUTPUT_SUFFIX} - LIBRARY_OUTPUT_DIRECTORY_MINSIZEREL ${CMAKE_BINARY_DIR}/MinSizeRel/${${name}_OUTPUT_SUFFIX} - LIBRARY_OUTPUT_DIRECTORY_RELWITHDEBINFO ${CMAKE_BINARY_DIR}/RelWithDebInfo/${${name}_OUTPUT_SUFFIX}) + set_target_properties("${name}_component" PROPERTIES + RUNTIME_OUTPUT_DIRECTORY_RELEASE "${CMAKE_BINARY_DIR}/Release/${${name}_OUTPUT_SUFFIX}" + RUNTIME_OUTPUT_DIRECTORY_DEBUG "${CMAKE_BINARY_DIR}/Debug/${${name}_OUTPUT_SUFFIX}" + RUNTIME_OUTPUT_DIRECTORY_MINSIZEREL "${CMAKE_BINARY_DIR}/MinSizeRel/${${name}_OUTPUT_SUFFIX}" + RUNTIME_OUTPUT_DIRECTORY_RELWITHDEBINFO "${CMAKE_BINARY_DIR}/RelWithDebInfo/${${name}_OUTPUT_SUFFIX}" + ARCHIVE_OUTPUT_DIRECTORY_RELEASE "${CMAKE_BINARY_DIR}/Release/${${name}_OUTPUT_SUFFIX}" + ARCHIVE_OUTPUT_DIRECTORY_DEBUG "${CMAKE_BINARY_DIR}/Debug/${${name}_OUTPUT_SUFFIX}" + ARCHIVE_OUTPUT_DIRECTORY_MINSIZEREL "${CMAKE_BINARY_DIR}/MinSizeRel/${${name}_OUTPUT_SUFFIX}" + ARCHIVE_OUTPUT_DIRECTORY_RELWITHDEBINFO "${CMAKE_BINARY_DIR}/RelWithDebInfo/${${name}_OUTPUT_SUFFIX}" + LIBRARY_OUTPUT_DIRECTORY_RELEASE "${CMAKE_BINARY_DIR}/Release/${${name}_OUTPUT_SUFFIX}" + LIBRARY_OUTPUT_DIRECTORY_DEBUG "${CMAKE_BINARY_DIR}/Debug/${${name}_OUTPUT_SUFFIX}" + LIBRARY_OUTPUT_DIRECTORY_MINSIZEREL "${CMAKE_BINARY_DIR}/MinSizeRel/${${name}_OUTPUT_SUFFIX}" + LIBRARY_OUTPUT_DIRECTORY_RELWITHDEBINFO "${CMAKE_BINARY_DIR}/RelWithDebInfo/${${name}_OUTPUT_SUFFIX}") else() - set_target_properties(${name}_component PROPERTIES - RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${${name}_OUTPUT_SUFFIX} - ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${${name}_OUTPUT_SUFFIX} - LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${${name}_OUTPUT_SUFFIX}) + set_target_properties("${name}_component" PROPERTIES + RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${${name}_OUTPUT_SUFFIX}" + ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${${name}_OUTPUT_SUFFIX}" + LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${${name}_OUTPUT_SUFFIX}") endif() endif() @@ -239,11 +239,11 @@ macro(add_hpx_component name) PROPERTIES SKIP_BUILD_RPATH TRUE BUILD_WITH_INSTALL_RPATH TRUE INSTALL_RPATH_USE_LINK_PATH TRUE - INSTALL_RPATH ${HPX_RPATH}) + INSTALL_RPATH "${HPX_RPATH}") endif() if(${name}_FOLDER) - set_target_properties(${name}_component PROPERTIES FOLDER ${${name}_FOLDER}) + set_target_properties(${name}_component PROPERTIES FOLDER "${${name}_FOLDER}") endif() set_property(TARGET ${name}_component APPEND @@ -254,7 +254,7 @@ macro(add_hpx_component name) if(NOT HPX_NO_INSTALL) if(${name}_INSTALL_SUFFIX) - hpx_library_install(${name}_component ${${name}_INSTALL_SUFFIX}) + hpx_library_install("${name}_component" "${${name}_INSTALL_SUFFIX}") else() hpx_library_install(${name}_component lib/hpx) endif() diff --git a/cmake/HPX_AddConfigTest.cmake b/cmake/HPX_AddConfigTest.cmake index a258ddf3db0d..906e4e91abda 100644 --- a/cmake/HPX_AddConfigTest.cmake +++ b/cmake/HPX_AddConfigTest.cmake @@ -26,7 +26,7 @@ macro(add_hpx_config_test name variable) hpx_info("config_test.${name}" "${variable} is currently set to OFF, test will not be performed for ${${name}_LANGUAGE}.") set(${variable} OFF CACHE STRING "${name} state.") else() - file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/${CMAKE_FILES_DIRECTORY}/config_tests) + file(MAKE_DIRECTORY "${CMAKE_BINARY_DIR}/${CMAKE_FILES_DIRECTORY}/config_tests") set(test_source "") @@ -47,7 +47,7 @@ macro(add_hpx_config_test name variable) hpx_print_list("DEBUG" "config_test.${name}" "Flags for config test with the ${${name}_LANGUAGE}" ${name}_FLAGS) hpx_compile(${name} SOURCE ${test_source} LANGUAGE ${${name}_LANGUAGE} - OUTPUT ${CMAKE_BINARY_DIR}/${CMAKE_FILES_DIRECTORY}/config_tests/${name} + OUTPUT "${CMAKE_BINARY_DIR}/${CMAKE_FILES_DIRECTORY}/config_tests/${name}" FLAGS ${${name}_FLAGS}) if(NOT "${${name}_HAS_UNUSED_ARGUMENT_WARNING}" STREQUAL "") @@ -89,7 +89,7 @@ macro(hpx_check_for_gnu_128bit_integers variable) add_hpx_config_test("gnu_int128" ${variable} LANGUAGE CXX SOURCE cmake/tests/gnu_128bit_integers.cpp - FLAGS ${boost_include_dir} ${include_dir} FILE ${ARGN}) + FLAGS "${boost_include_dir}" "${include_dir}" FILE ${ARGN}) endmacro() macro(hpx_check_for_gnu_aligned_16 variable) @@ -98,7 +98,7 @@ macro(hpx_check_for_gnu_aligned_16 variable) add_hpx_config_test("gnu_aligned_16" ${variable} LANGUAGE CXX SOURCE cmake/tests/gnu_aligned_16.cpp - FLAGS ${boost_include_dir} ${include_dir} FILE ${ARGN}) + FLAGS "${boost_include_dir}" "${include_dir}" FILE ${ARGN}) endmacro() ############################################################################### @@ -108,7 +108,7 @@ macro(hpx_check_for_pthread_affinity_np variable) add_hpx_config_test("pthread_affinity_np" ${variable} LANGUAGE CXX SOURCE cmake/tests/pthread_affinity_np.cpp - FLAGS -pthread ${boost_include_dir} ${include_dir} FILE ${ARGN}) + FLAGS -pthread "${boost_include_dir}" "${include_dir}" FILE ${ARGN}) endmacro() ############################################################################### @@ -118,7 +118,7 @@ macro(hpx_cpuid target variable) add_hpx_config_test("${target}" ${variable} LANGUAGE CXX SOURCE cmake/tests/cpuid.cpp - FLAGS ${boost_include_dir} ${include_dir} + FLAGS "${boost_include_dir}" "${include_dir}" FILE ARGS "${target}" ${ARGN}) endmacro() @@ -129,7 +129,7 @@ macro(hpx_check_for_cxx11_rvalue_references variable) add_hpx_config_test("cxx11_rvalue_references" ${variable} LANGUAGE CXX SOURCE cmake/tests/cxx11_rvalue_references.cpp - FLAGS ${boost_include_dir} ${include_dir} "-std=c++0x" FILE ${ARGN}) + FLAGS "${boost_include_dir}" "${include_dir}" "-std=c++0x" FILE ${ARGN}) endmacro() ############################################################################### @@ -139,7 +139,7 @@ macro(hpx_check_for_cxx11_variadic_templates variable) add_hpx_config_test("cxx11_variadic_templates" ${variable} LANGUAGE CXX SOURCE cmake/tests/cxx11_variadic_templates.cpp - FLAGS ${boost_include_dir} ${include_dir} "-std=c++0x" FILE ${ARGN}) + FLAGS "${boost_include_dir}" "${include_dir}" "-std=c++0x" FILE ${ARGN}) endmacro() ############################################################################### @@ -149,7 +149,7 @@ macro(hpx_check_for_cxx11_lambdas variable) add_hpx_config_test("cxx11_lambdas" ${variable} LANGUAGE CXX SOURCE cmake/tests/cxx11_lambdas.cpp - FLAGS ${boost_include_dir} ${include_dir} "-std=c++0x" FILE ${ARGN}) + FLAGS "${boost_include_dir}" "${include_dir}" "-std=c++0x" FILE ${ARGN}) endmacro() ############################################################################### @@ -159,7 +159,7 @@ macro(hpx_check_for_cxx11_auto variable) add_hpx_config_test("cxx11_auto" ${variable} LANGUAGE CXX SOURCE cmake/tests/cxx11_auto.cpp - FLAGS ${boost_include_dir} ${include_dir} "-std=c++0x" FILE ${ARGN}) + FLAGS "${boost_include_dir}" "${include_dir}" "-std=c++0x" FILE ${ARGN}) endmacro() ############################################################################### @@ -169,7 +169,7 @@ macro(hpx_check_for_cxx11_decltype variable) add_hpx_config_test("cxx11_decltype" ${variable} LANGUAGE CXX SOURCE cmake/tests/cxx11_decltype.cpp - FLAGS ${boost_include_dir} ${include_dir} "-std=c++0x" FILE ${ARGN}) + FLAGS "${boost_include_dir}" "${include_dir}" "-std=c++0x" FILE ${ARGN}) endmacro() ############################################################################### @@ -179,7 +179,7 @@ macro(hpx_check_for_cxx11_alias_templates variable) add_hpx_config_test("cxx11_alias_templates" ${variable} LANGUAGE CXX SOURCE cmake/tests/cxx11_alias_templates.cpp - FLAGS ${boost_include_dir} ${include_dir} "-std=c++0x" FILE ${ARGN}) + FLAGS "${boost_include_dir}" "${include_dir}" "-std=c++0x" FILE ${ARGN}) endmacro() ############################################################################### @@ -189,7 +189,7 @@ macro(hpx_check_for_cxx11_defaulted_deleted_functions variable) add_hpx_config_test("cxx11_defaulted_deleted_functions" ${variable} LANGUAGE CXX SOURCE cmake/tests/cxx11_defaulted_deleted_functions.cpp - FLAGS ${boost_include_dir} ${include_dir} "-std=c++0x" FILE ${ARGN}) + FLAGS "${boost_include_dir}" "${include_dir}" "-std=c++0x" FILE ${ARGN}) endmacro() ############################################################################### @@ -200,11 +200,11 @@ macro(hpx_check_for_cxx11_std_unique_ptr variable) if(APPLE) add_hpx_config_test("cxx11_std_unique_ptr" ${variable} LANGUAGE CXX SOURCE cmake/tests/cxx11_std_unique_ptr.cpp - FLAGS ${boost_include_dir} ${include_dir} "-std=c++0x -stdlib=libc++" FILE ${ARGN}) + FLAGS "${boost_include_dir}" "${include_dir}" "-std=c++0x -stdlib=libc++" FILE ${ARGN}) else() add_hpx_config_test("cxx11_std_unique_ptr" ${variable} LANGUAGE CXX SOURCE cmake/tests/cxx11_std_unique_ptr.cpp - FLAGS ${boost_include_dir} ${include_dir} "-std=c++0x" FILE ${ARGN}) + FLAGS "${boost_include_dir}" "${include_dir}" "-std=c++0x" FILE ${ARGN}) endif() endmacro() @@ -216,11 +216,11 @@ macro(hpx_check_for_cxx11_std_tuple variable) if(APPLE) add_hpx_config_test("cxx11_std_tuple" ${variable} LANGUAGE CXX SOURCE cmake/tests/cxx11_std_tuple.cpp - FLAGS ${boost_include_dir} ${include_dir} "-std=c++0x -stdlib=libc++" FILE ${ARGN}) + FLAGS "${boost_include_dir}" "${include_dir}" "-std=c++0x -stdlib=libc++" FILE ${ARGN}) else() add_hpx_config_test("cxx11_std_tuple" ${variable} LANGUAGE CXX SOURCE cmake/tests/cxx11_std_tuple.cpp - FLAGS ${boost_include_dir} ${include_dir} "-std=c++0x" FILE ${ARGN}) + FLAGS "${boost_include_dir}" "${include_dir}" "-std=c++0x" FILE ${ARGN}) endif() endmacro() @@ -232,11 +232,11 @@ macro(hpx_check_for_cxx11_std_bind variable) if(APPLE) add_hpx_config_test("cxx11_std_bind" ${variable} LANGUAGE CXX SOURCE cmake/tests/cxx11_std_bind.cpp - FLAGS ${boost_include_dir} ${include_dir} "-std=c++0x -stdlib=libc++" FILE ${ARGN}) + FLAGS "${boost_include_dir}" "${include_dir}" "-std=c++0x -stdlib=libc++" FILE ${ARGN}) else() add_hpx_config_test("cxx11_std_bind" ${variable} LANGUAGE CXX SOURCE cmake/tests/cxx11_std_bind.cpp - FLAGS ${boost_include_dir} ${include_dir} "-std=c++0x" FILE ${ARGN}) + FLAGS "${boost_include_dir}" "${include_dir}" "-std=c++0x" FILE ${ARGN}) endif() endmacro() @@ -248,11 +248,11 @@ macro(hpx_check_for_cxx11_std_function variable) if(APPLE) add_hpx_config_test("cxx11_std_function" ${variable} LANGUAGE CXX SOURCE cmake/tests/cxx11_std_function.cpp - FLAGS ${boost_include_dir} ${include_dir} "-std=c++0x -stdlib=libc++" FILE ${ARGN}) + FLAGS "${boost_include_dir}" "${include_dir}" "-std=c++0x -stdlib=libc++" FILE ${ARGN}) else() add_hpx_config_test("cxx11_std_function" ${variable} LANGUAGE CXX SOURCE cmake/tests/cxx11_std_function.cpp - FLAGS ${boost_include_dir} ${include_dir} "-std=c++0x" FILE ${ARGN}) + FLAGS "${boost_include_dir}" "${include_dir}" "-std=c++0x" FILE ${ARGN}) endif() endmacro() @@ -277,6 +277,6 @@ macro(hpx_check_for_thread_safe_hdf5 variable) add_hpx_config_test("hdf5_thread_safe" ${variable} LANGUAGE CXX SOURCE cmake/tests/hdf5_thread_safe.cpp - FLAGS -I${HDF5_INCLUDE_DIR} ${include_dir} FILE ${ARGN}) + FLAGS "-I${HDF5_INCLUDE_DIR}" "${include_dir}" FILE ${ARGN}) endmacro() diff --git a/cmake/HPX_AddExecutable.cmake b/cmake/HPX_AddExecutable.cmake index e2ba3b6b70c0..2ba8d38e9e22 100644 --- a/cmake/HPX_AddExecutable.cmake +++ b/cmake/HPX_AddExecutable.cmake @@ -119,32 +119,32 @@ macro(add_hpx_executable name) if(HPX_SET_OUTPUT_PATH AND NOT ${name}_OUTPUT_SUFFIX) if(MSVC) - set_target_properties(${name}_exe PROPERTIES - RUNTIME_OUTPUT_DIRECTORY_RELEASE ${HPX_RUNTIME_OUTPUT_DIRECTORY_RELEASE} - RUNTIME_OUTPUT_DIRECTORY_DEBUG ${HPX_RUNTIME_OUTPUT_DIRECTORY_DEBUG} - RUNTIME_OUTPUT_DIRECTORY_MINSIZEREL ${HPX_RUNTIME_OUTPUT_DIRECTORY_MINSIZEREL} - RUNTIME_OUTPUT_DIRECTORY_RELWITHDEBINFO ${HPX_RUNTIME_OUTPUT_DIRECTORY_RELWITHDEBINFO}) + set_target_properties("${name}_exe" PROPERTIES + RUNTIME_OUTPUT_DIRECTORY_RELEASE "${HPX_RUNTIME_OUTPUT_DIRECTORY_RELEASE}" + RUNTIME_OUTPUT_DIRECTORY_DEBUG "${HPX_RUNTIME_OUTPUT_DIRECTORY_DEBUG}" + RUNTIME_OUTPUT_DIRECTORY_MINSIZEREL "${HPX_RUNTIME_OUTPUT_DIRECTORY_MINSIZEREL}" + RUNTIME_OUTPUT_DIRECTORY_RELWITHDEBINFO "${HPX_RUNTIME_OUTPUT_DIRECTORY_RELWITHDEBINFO}") else() - set_target_properties(${name}_exe PROPERTIES - RUNTIME_OUTPUT_DIRECTORY ${HPX_RUNTIME_OUTPUT_DIRECTORY}) + set_target_properties("${name}_exe" PROPERTIES + RUNTIME_OUTPUT_DIRECTORY "${HPX_RUNTIME_OUTPUT_DIRECTORY}") endif() elseif(${name}_OUTPUT_SUFFIX) if(MSVC) - set_target_properties(${name}_exe PROPERTIES - RUNTIME_OUTPUT_DIRECTORY_RELEASE ${CMAKE_BINARY_DIR}/Release/${${name}_OUTPUT_SUFFIX} - RUNTIME_OUTPUT_DIRECTORY_DEBUG ${CMAKE_BINARY_DIR}/Debug/${${name}_OUTPUT_SUFFIX} - RUNTIME_OUTPUT_DIRECTORY_MINSIZEREL ${CMAKE_BINARY_DIR}/MinSizeRel/${${name}_OUTPUT_SUFFIX} - RUNTIME_OUTPUT_DIRECTORY_RELWITHDEBINFO ${CMAKE_BINARY_DIR}/RelWithDebInfo/${${name}_OUTPUT_SUFFIX}) + set_target_properties("${name}_exe" PROPERTIES + RUNTIME_OUTPUT_DIRECTORY_RELEASE "${CMAKE_BINARY_DIR}/Release/${${name}_OUTPUT_SUFFIX}" + RUNTIME_OUTPUT_DIRECTORY_DEBUG "${CMAKE_BINARY_DIR}/Debug/${${name}_OUTPUT_SUFFIX}" + RUNTIME_OUTPUT_DIRECTORY_MINSIZEREL "${CMAKE_BINARY_DIR}/MinSizeRel/${${name}_OUTPUT_SUFFIX}" + RUNTIME_OUTPUT_DIRECTORY_RELWITHDEBINFO "${CMAKE_BINARY_DIR}/RelWithDebInfo/${${name}_OUTPUT_SUFFIX}") else() - set_target_properties(${name}_exe PROPERTIES - RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${${name}_OUTPUT_SUFFIX}) + set_target_properties("${name}_exe" PROPERTIES + RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${${name}_OUTPUT_SUFFIX}") endif() endif() set_target_properties(${name}_exe PROPERTIES OUTPUT_NAME ${name}) if(${name}_FOLDER) - set_target_properties(${name}_exe PROPERTIES FOLDER ${${name}_FOLDER}) + set_target_properties(${name}_exe PROPERTIES FOLDER "${${name}_FOLDER}") endif() set_property(TARGET ${name}_exe APPEND @@ -243,7 +243,7 @@ macro(add_hpx_executable name) if(NOT HPX_NO_INSTALL) if(${name}_INSTALL_SUFFIX) - hpx_executable_install(${name}_exe ${${name}_INSTALL_SUFFIX}) + hpx_executable_install("${name}_exe" "${${name}_INSTALL_SUFFIX}") else() hpx_executable_install(${name}_exe bin) endif() diff --git a/cmake/HPX_AddLibrary.cmake b/cmake/HPX_AddLibrary.cmake index a68c27258dba..7f39700a5ebf 100644 --- a/cmake/HPX_AddLibrary.cmake +++ b/cmake/HPX_AddLibrary.cmake @@ -167,45 +167,45 @@ macro(add_hpx_library name) if(HPX_SET_OUTPUT_PATH AND NOT ${name}_OUTPUT_SUFFIX) if(MSVC) - set_target_properties(${name}_lib PROPERTIES - RUNTIME_OUTPUT_DIRECTORY_RELEASE ${HPX_LIBRARY_OUTPUT_DIRECTORY_RELEASE} - RUNTIME_OUTPUT_DIRECTORY_DEBUG ${HPX_LIBRARY_OUTPUT_DIRECTORY_DEBUG} - RUNTIME_OUTPUT_DIRECTORY_MINSIZEREL ${HPX_LIBRARY_OUTPUT_DIRECTORY_MINSIZEREL} - RUNTIME_OUTPUT_DIRECTORY_RELWITHDEBINFO ${HPX_LIBRARY_OUTPUT_DIRECTORY_RELWITHDEBINFO} - ARCHIVE_OUTPUT_DIRECTORY_RELEASE ${HPX_ARCHIVE_OUTPUT_DIRECTORY_RELEASE} - ARCHIVE_OUTPUT_DIRECTORY_DEBUG ${HPX_ARCHIVE_OUTPUT_DIRECTORY_DEBUG} - ARCHIVE_OUTPUT_DIRECTORY_MINSIZEREL ${HPX_ARCHIVE_OUTPUT_DIRECTORY_MINSIZEREL} - ARCHIVE_OUTPUT_DIRECTORY_RELWITHDEBINFO ${HPX_ARCHIVE_OUTPUT_DIRECTORY_RELWITHDEBINFO} - LIBRARY_OUTPUT_DIRECTORY_RELEASE ${HPX_LIBRARY_OUTPUT_DIRECTORY_RELEASE} - LIBRARY_OUTPUT_DIRECTORY_DEBUG ${HPX_LIBRARY_OUTPUT_DIRECTORY_DEBUG} - LIBRARY_OUTPUT_DIRECTORY_MINSIZEREL ${HPX_LIBRARY_OUTPUT_DIRECTORY_MINSIZEREL} - LIBRARY_OUTPUT_DIRECTORY_RELWITHDEBINFO ${HPX_LIBRARY_OUTPUT_DIRECTORY_RELWITHDEBINFO}) + set_target_properties("${name}_lib" PROPERTIES + RUNTIME_OUTPUT_DIRECTORY_RELEASE "${HPX_LIBRARY_OUTPUT_DIRECTORY_RELEASE}" + RUNTIME_OUTPUT_DIRECTORY_DEBUG "${HPX_LIBRARY_OUTPUT_DIRECTORY_DEBUG}" + RUNTIME_OUTPUT_DIRECTORY_MINSIZEREL "${HPX_LIBRARY_OUTPUT_DIRECTORY_MINSIZEREL}" + RUNTIME_OUTPUT_DIRECTORY_RELWITHDEBINFO "${HPX_LIBRARY_OUTPUT_DIRECTORY_RELWITHDEBINFO}" + ARCHIVE_OUTPUT_DIRECTORY_RELEASE "${HPX_ARCHIVE_OUTPUT_DIRECTORY_RELEASE}" + ARCHIVE_OUTPUT_DIRECTORY_DEBUG "${HPX_ARCHIVE_OUTPUT_DIRECTORY_DEBUG}" + ARCHIVE_OUTPUT_DIRECTORY_MINSIZEREL "${HPX_ARCHIVE_OUTPUT_DIRECTORY_MINSIZEREL}" + ARCHIVE_OUTPUT_DIRECTORY_RELWITHDEBINFO "${HPX_ARCHIVE_OUTPUT_DIRECTORY_RELWITHDEBINFO}" + LIBRARY_OUTPUT_DIRECTORY_RELEASE "${HPX_LIBRARY_OUTPUT_DIRECTORY_RELEASE}" + LIBRARY_OUTPUT_DIRECTORY_DEBUG "${HPX_LIBRARY_OUTPUT_DIRECTORY_DEBUG}" + LIBRARY_OUTPUT_DIRECTORY_MINSIZEREL "${HPX_LIBRARY_OUTPUT_DIRECTORY_MINSIZEREL}" + LIBRARY_OUTPUT_DIRECTORY_RELWITHDEBINFO "${HPX_LIBRARY_OUTPUT_DIRECTORY_RELWITHDEBINFO}") else() - set_target_properties(${name}_lib PROPERTIES - RUNTIME_OUTPUT_DIRECTORY ${HPX_LIBRARY_OUTPUT_DIRECTORY} - ARCHIVE_OUTPUT_DIRECTORY ${HPX_LIBRARY_OUTPUT_DIRECTORY} - LIBRARY_OUTPUT_DIRECTORY ${HPX_LIBRARY_OUTPUT_DIRECTORY}) + set_target_properties("${name}_lib" PROPERTIES + RUNTIME_OUTPUT_DIRECTORY "${HPX_LIBRARY_OUTPUT_DIRECTORY}" + ARCHIVE_OUTPUT_DIRECTORY "${HPX_LIBRARY_OUTPUT_DIRECTORY}" + LIBRARY_OUTPUT_DIRECTORY "${HPX_LIBRARY_OUTPUT_DIRECTORY}") endif() elseif(${name}_OUTPUT_SUFFIX) if(MSVC) - set_target_properties(${name}_lib PROPERTIES - RUNTIME_OUTPUT_DIRECTORY_RELEASE ${CMAKE_BINARY_DIR}/Release/${${name}_OUTPUT_SUFFIX} - RUNTIME_OUTPUT_DIRECTORY_DEBUG ${CMAKE_BINARY_DIR}/Debug/${${name}_OUTPUT_SUFFIX} - RUNTIME_OUTPUT_DIRECTORY_MINSIZEREL ${CMAKE_BINARY_DIR}/MinSizeRel/${${name}_OUTPUT_SUFFIX} - RUNTIME_OUTPUT_DIRECTORY_RELWITHDEBINFO ${CMAKE_BINARY_DIR}/RelWithDebInfo/${${name}_OUTPUT_SUFFIX} - ARCHIVE_OUTPUT_DIRECTORY_RELEASE ${CMAKE_BINARY_DIR}/Release/${${name}_OUTPUT_SUFFIX} - ARCHIVE_OUTPUT_DIRECTORY_DEBUG ${CMAKE_BINARY_DIR}/Debug/${${name}_OUTPUT_SUFFIX} - ARCHIVE_OUTPUT_DIRECTORY_MINSIZEREL ${CMAKE_BINARY_DIR}/MinSizeRel/${${name}_OUTPUT_SUFFIX} - ARCHIVE_OUTPUT_DIRECTORY_RELWITHDEBINFO ${CMAKE_BINARY_DIR}/RelWithDebInfo/${${name}_OUTPUT_SUFFIX} - LIBRARY_OUTPUT_DIRECTORY_RELEASE ${CMAKE_BINARY_DIR}/Release/${${name}_OUTPUT_SUFFIX} - LIBRARY_OUTPUT_DIRECTORY_DEBUG ${CMAKE_BINARY_DIR}/Debug/${${name}_OUTPUT_SUFFIX} - LIBRARY_OUTPUT_DIRECTORY_MINSIZEREL ${CMAKE_BINARY_DIR}/MinSizeRel/${${name}_OUTPUT_SUFFIX} - LIBRARY_OUTPUT_DIRECTORY_RELWITHDEBINFO ${CMAKE_BINARY_DIR}/RelWithDebInfo/${${name}_OUTPUT_SUFFIX}) + set_target_properties("${name}_lib" PROPERTIES + RUNTIME_OUTPUT_DIRECTORY_RELEASE "${CMAKE_BINARY_DIR}/Release/${${name}_OUTPUT_SUFFIX}" + RUNTIME_OUTPUT_DIRECTORY_DEBUG "${CMAKE_BINARY_DIR}/Debug/${${name}_OUTPUT_SUFFIX}" + RUNTIME_OUTPUT_DIRECTORY_MINSIZEREL "${CMAKE_BINARY_DIR}/MinSizeRel/${${name}_OUTPUT_SUFFIX}" + RUNTIME_OUTPUT_DIRECTORY_RELWITHDEBINFO "${CMAKE_BINARY_DIR}/RelWithDebInfo/${${name}_OUTPUT_SUFFIX}" + ARCHIVE_OUTPUT_DIRECTORY_RELEASE "${CMAKE_BINARY_DIR}/Release/${${name}_OUTPUT_SUFFIX}" + ARCHIVE_OUTPUT_DIRECTORY_DEBUG "${CMAKE_BINARY_DIR}/Debug/${${name}_OUTPUT_SUFFIX}" + ARCHIVE_OUTPUT_DIRECTORY_MINSIZEREL "${CMAKE_BINARY_DIR}/MinSizeRel/${${name}_OUTPUT_SUFFIX}" + ARCHIVE_OUTPUT_DIRECTORY_RELWITHDEBINFO "${CMAKE_BINARY_DIR}/RelWithDebInfo/${${name}_OUTPUT_SUFFIX}" + LIBRARY_OUTPUT_DIRECTORY_RELEASE "${CMAKE_BINARY_DIR}/Release/${${name}_OUTPUT_SUFFIX}" + LIBRARY_OUTPUT_DIRECTORY_DEBUG "${CMAKE_BINARY_DIR}/Debug/${${name}_OUTPUT_SUFFIX}" + LIBRARY_OUTPUT_DIRECTORY_MINSIZEREL "${CMAKE_BINARY_DIR}/MinSizeRel/${${name}_OUTPUT_SUFFIX}" + LIBRARY_OUTPUT_DIRECTORY_RELWITHDEBINFO "${CMAKE_BINARY_DIR}/RelWithDebInfo/${${name}_OUTPUT_SUFFIX}") else() - set_target_properties(${name}_lib PROPERTIES - RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${${name}_OUTPUT_SUFFIX} - ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${${name}_OUTPUT_SUFFIX} - LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${${name}_OUTPUT_SUFFIX}) + set_target_properties("${name}_lib" PROPERTIES + RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${${name}_OUTPUT_SUFFIX}" + ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${${name}_OUTPUT_SUFFIX}" + LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${${name}_OUTPUT_SUFFIX}") endif() endif() @@ -233,11 +233,11 @@ macro(add_hpx_library name) PROPERTIES SKIP_BUILD_RPATH TRUE BUILD_WITH_INSTALL_RPATH TRUE INSTALL_RPATH_USE_LINK_PATH TRUE - INSTALL_RPATH ${HPX_RPATH}) + INSTALL_RPATH "${HPX_RPATH}") endif() if(${name}_FOLDER) - set_target_properties(${name}_lib PROPERTIES FOLDER ${${name}_FOLDER}) + set_target_properties(${name}_lib PROPERTIES FOLDER "${${name}_FOLDER}") endif() set_property(TARGET ${name}_lib APPEND @@ -246,7 +246,7 @@ macro(add_hpx_library name) if(NOT HPX_NO_INSTALL) if(${name}_INSTALL_SUFFIX) - hpx_library_install(${name}_lib ${${name}_INSTALL_SUFFIX}) + hpx_library_install("${name}_lib" "${${name}_INSTALL_SUFFIX}") else() hpx_library_install(${name}_lib lib/hpx) endif() diff --git a/cmake/HPX_AddPythonConfigTest.cmake b/cmake/HPX_AddPythonConfigTest.cmake index 89265540dda8..55cc1c4f2bda 100644 --- a/cmake/HPX_AddPythonConfigTest.cmake +++ b/cmake/HPX_AddPythonConfigTest.cmake @@ -21,7 +21,7 @@ macro(add_hpx_python_config_test name variable) elseif("${variable}" STREQUAL "OFF") set(${variable} OFF CACHE STRING "${name} state.") else() - file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/${CMAKE_FILES_DIRECTORY}/config_tests) + file(MAKE_DIRECTORY "${CMAKE_BINARY_DIR}/${CMAKE_FILES_DIRECTORY}/config_tests") set(test_source "") diff --git a/cmake/HPX_AddSourceGroup.cmake b/cmake/HPX_AddSourceGroup.cmake index 32da2ad9661f..bf384877f4dd 100644 --- a/cmake/HPX_AddSourceGroup.cmake +++ b/cmake/HPX_AddSourceGroup.cmake @@ -22,7 +22,7 @@ macro(add_hpx_source_group) if (NOT GROUP_ROOT) set(GROUP_ROOT ".") endif() - get_filename_component(root ${GROUP_ROOT} ABSOLUTE) + get_filename_component(root "${GROUP_ROOT}" ABSOLUTE) foreach(target ${targets}) string(REGEX REPLACE "${root}" "" relpath "${target}") diff --git a/cmake/HPX_AddTest.cmake b/cmake/HPX_AddTest.cmake index 4ddb1248db1a..ec0988e39184 100644 --- a/cmake/HPX_AddTest.cmake +++ b/cmake/HPX_AddTest.cmake @@ -64,7 +64,7 @@ macro(add_hpx_test category name) add_test( NAME "${category}.${name}" - COMMAND ${CMAKE_SOURCE_DIR}/python/scripts/hpx_run_test.py + COMMAND "${CMAKE_SOURCE_DIR}/python/scripts/hpx_run_test.py" --log-stdout "[${test_output}]") endmacro() diff --git a/cmake/HPX_Compile.cmake b/cmake/HPX_Compile.cmake index 4775b9455bce..9191ca29a7ee 100644 --- a/cmake/HPX_Compile.cmake +++ b/cmake/HPX_Compile.cmake @@ -91,7 +91,7 @@ if(NOT CMAKE_CROSSCOMPILING) string(REGEX MATCH "(argument unused during compilation|unknown warning option)" ${name}_HAS_UNUSED_ARGUMENT_WARNING ${${name}_STDERR}) endif() endif() - file(WRITE ${CMAKE_BINARY_DIR}/${CMAKE_FILES_DIRECTORY}/${name}.${${name}_LANGUAGE}.log ${${name}_STDERR} ${${name}_STDOUT} "\n") + file(WRITE "${CMAKE_BINARY_DIR}/${CMAKE_FILES_DIRECTORY}/${name}.${${name}_LANGUAGE}.log" ${${name}_STDERR} ${${name}_STDOUT} "\n") endif() endmacro() else() @@ -108,14 +108,14 @@ else() set(${name_RESULT} "test") try_compile( - ${name}_RESULT ${${name}_OUTPUT_DIR} ${${name}_SOURCE} + "${name}_RESULT" "${${name}_OUTPUT_DIR}" "${${name}_SOURCE}" COMPILE_DEFINITIONS "${${name}_FLAGS_STRING}" - OUTPUT_VARIABLE ${name}_OUT - COPY_FILE ${${name}_OUTPUT}) + OUTPUT_VARIABLE "${name}_OUT" + COPY_FILE "${${name}_OUTPUT}") hpx_debug("compile" "${${name}_OUT}") if(${name}_OUT) - file(WRITE ${CMAKE_BINARY_DIR}/${CMAKE_FILES_DIRECTORY}/${name}.${${name}_LANGUAGE}.log ${${name}_OUT}) + file(WRITE "${CMAKE_BINARY_DIR}/${CMAKE_FILES_DIRECTORY}/${name}.${${name}_LANGUAGE}.log" ${${name}_OUT}) endif() if(${name}_RESULT) set(${name}_RESULT "0") diff --git a/cmake/HPX_Documentation.cmake b/cmake/HPX_Documentation.cmake index c6675f4f05bb..2de8f70c7341 100644 --- a/cmake/HPX_Documentation.cmake +++ b/cmake/HPX_Documentation.cmake @@ -90,8 +90,8 @@ if(NOT HPX_BUILD_DOCUMENTATION) else() - set(BOOSTBOOK_DTD_PATH ${hpx_SOURCE_DIR}/external/boostbook/dtd/) - set(BOOSTBOOK_XSL_PATH ${hpx_SOURCE_DIR}/external/boostbook/xsl/) + set(BOOSTBOOK_DTD_PATH "${hpx_SOURCE_DIR}/external/boostbook/dtd/") + set(BOOSTBOOK_XSL_PATH "${hpx_SOURCE_DIR}/external/boostbook/xsl/") # Generate catalog file for XSLT processing macro(hpx_write_boostbook_catalog file) @@ -149,7 +149,7 @@ else() if(input_path STREQUAL "") set(input_path "${CMAKE_CURRENT_SOURCE_DIR}/${${name}_SOURCE}") else() - set(input_path ${${name}_SOURCE}) + set(input_path "${${name}_SOURCE}") endif() set(git_commit_option "") @@ -167,7 +167,7 @@ else() set(doc_source_dir "'''file:///${hpx_SOURCE_DIR}'''") endif() add_custom_command(OUTPUT ${name}.xml - COMMAND ${BOOSTQUICKBOOK_PROGRAM} + COMMAND "${BOOSTQUICKBOOK_PROGRAM}" "--output-file=${name}.xml" "${git_commit_option}" "${doxygen_option}" @@ -177,7 +177,8 @@ else() ${${name}_QUICKBOOK_ARGS} "${input_path}" COMMENT "Generating BoostBook XML file ${name}.xml from ${${name}_SOURCE}." - DEPENDS ${${name}_SOURCE} ${${name}_DEPENDENCIES}) + DEPENDS "${${name}_SOURCE}" ${${name}_DEPENDENCIES} + VERBATIM) endmacro() # BoostBook XML -> DocBook @@ -187,37 +188,39 @@ else() if(NOT BOOST_ROOT) set(BOOST_ROOT_FOR_DOCS ".") else() - set(BOOST_ROOT_FOR_DOCS ${BOOST_ROOT}) + set(BOOST_ROOT_FOR_DOCS "${BOOST_ROOT}") endif() if(WIN32) - add_custom_command(OUTPUT ${name}.dbk + add_custom_command(OUTPUT "${name}.dbk" COMMAND set XML_CATALOG_FILES=${${name}_CATALOG} - COMMAND ${XSLTPROC_PROGRAM} ${${name}_XSLTPROC_ARGS} + COMMAND "${XSLTPROC_PROGRAM}" ${${name}_XSLTPROC_ARGS} "--stringparam" "boost.graphics.root" "images/" "--stringparam" "admon.graphics.path" "images/" "--stringparam" "callout.graphics.path" "images/" "--stringparam" "boost.root" "${BOOST_ROOT_FOR_DOCS}" "--stringparam" "html.stylesheet" "src/boostbook.css" - "--xinclude" "-o" ${name}.dbk - "--path" ${CMAKE_CURRENT_BINARY_DIR} - ${BOOSTBOOK_XSL_PATH}/docbook.xsl ${${name}_SOURCE} + "--xinclude" "-o" "${name}.dbk" + "--path" "${CMAKE_CURRENT_BINARY_DIR}" + "${BOOSTBOOK_XSL_PATH}/docbook.xsl" "${${name}_SOURCE}" COMMENT "Generating DocBook file ${name}.dbk from ${${name}_SOURCE}." - DEPENDS ${${name}_SOURCE} ${${name}_DEPENDENCIES}) + DEPENDS "${${name}_SOURCE}" ${${name}_DEPENDENCIES} + VERBATIM) else() - add_custom_command(OUTPUT ${name}.dbk - COMMAND "XML_CATALOG_FILES=${${name}_CATALOG}" ${XSLTPROC_PROGRAM} + add_custom_command(OUTPUT "${name}.dbk" + COMMAND "XML_CATALOG_FILES=${${name}_CATALOG}" "${XSLTPROC_PROGRAM}" ${${name}_XSLTPROC_ARGS} "--stringparam" "boost.graphics.root" "images/" "--stringparam" "admon.graphics.path" "images/" "--stringparam" "callout.graphics.path" "images/" "--stringparam" "boost.root" "${BOOST_ROOT_FOR_DOCS}" "--stringparam" "html.stylesheet" "src/boostbook.css" - "--xinclude" "-o" ${name}.dbk - "--path" ${CMAKE_CURRENT_BINARY_DIR} - ${BOOSTBOOK_XSL_PATH}/docbook.xsl ${${name}_SOURCE} + "--xinclude" "-o" "${name}.dbk" + "--path" "${CMAKE_CURRENT_BINARY_DIR}" + "${BOOSTBOOK_XSL_PATH}/docbook.xsl" "${${name}_SOURCE}" COMMENT "Generating DocBook file ${name}.dbk from ${${name}_SOURCE}." - DEPENDS ${${name}_SOURCE} ${${name}_DEPENDENCIES}) + DEPENDS "${${name}_SOURCE}" ${${name}_DEPENDENCIES} + VERBATIM) endif() endmacro() @@ -228,27 +231,28 @@ else() if(NOT BOOST_ROOT) set(BOOST_ROOT_FOR_DOCS ".") else() - set(BOOST_ROOT_FOR_DOCS ${BOOST_ROOT}) + set(BOOST_ROOT_FOR_DOCS "${BOOST_ROOT}") endif() if(WIN32) - add_custom_command(OUTPUT ${name}.fo + add_custom_command(OUTPUT "${name}.fo" COMMAND set XML_CATALOG_FILES=${${name}_CATALOG} - COMMAND ${XSLTPROC_PROGRAM} ${${name}_XSLTPROC_ARGS} + COMMAND "${XSLTPROC_PROGRAM}" ${${name}_XSLTPROC_ARGS} "--stringparam" "paper.type" "USLetter" "--stringparam" "admon.graphics.extension" ".png" "--stringparam" "img.src.path" "${hpx_SOURCE_DIR}/docs/html/" "--stringparam" "boost.graphics.root" "${hpx_SOURCE_DIR}/docs/html/images/" "--stringparam" "admon.graphics.path" "${hpx_SOURCE_DIR}/docs/html/images/" "--stringparam" "callout.graphics.path" "${hpx_SOURCE_DIR}/docs/html/images/" - "--xinclude" "-o" ${name}.fo - "--path" ${CMAKE_CURRENT_BINARY_DIR} - ${BOOSTBOOK_XSL_PATH}/fo.xsl ${${name}_SOURCE} + "--xinclude" "-o" "${name}.fo" + "--path" "${CMAKE_CURRENT_BINARY_DIR}" + "${BOOSTBOOK_XSL_PATH}/fo.xsl" "${${name}_SOURCE}" COMMENT "Generating XSL-FO file ${name}.fo from ${${name}_SOURCE}." - DEPENDS ${${name}_SOURCE} ${${name}_DEPENDENCIES}) + DEPENDS "${${name}_SOURCE}" ${${name}_DEPENDENCIES} + VERBATIM) else() - add_custom_command(OUTPUT ${name}.fo - COMMAND "XML_CATALOG_FILES=${${name}_CATALOG}" ${XSLTPROC_PROGRAM} + add_custom_command(OUTPUT "${name}.fo" + COMMAND "XML_CATALOG_FILES=${${name}_CATALOG}" "${XSLTPROC_PROGRAM}" ${${name}_XSLTPROC_ARGS} "--stringparam" "paper.type" "USLetter" "--stringparam" "admon.graphics.extension" ".png" @@ -256,11 +260,12 @@ else() "--stringparam" "boost.graphics.root" "${hpx_SOURCE_DIR}/docs/html/images/" "--stringparam" "admon.graphics.path" "${hpx_SOURCE_DIR}/docs/html/images/" "--stringparam" "callout.graphics.path" "${hpx_SOURCE_DIR}/docs/html/images/" - "--xinclude" "-o" ${name}.fo - "--path" ${CMAKE_CURRENT_BINARY_DIR} - ${BOOSTBOOK_XSL_PATH}/fo.xsl ${${name}_SOURCE} + "--xinclude" "-o" "${name}.fo" + "--path" "${CMAKE_CURRENT_BINARY_DIR}" + "${BOOSTBOOK_XSL_PATH}/fo.xsl" "${${name}_SOURCE}" COMMENT "Generating XSL-FO file ${name}.fo from ${${name}_SOURCE}." - DEPENDS ${${name}_SOURCE} ${${name}_DEPENDENCIES}) + DEPENDS "${${name}_SOURCE}" ${${name}_DEPENDENCIES} + VERBATIM) endif() endmacro() @@ -274,11 +279,12 @@ else() set(DOCS_OUTPUT_DIR "/${CMAKE_BINARY_DIR}/share/hpx-${HPX_VERSION}/docs/") endif() - add_custom_command(OUTPUT ${name}.pdf - COMMAND ${FOP_PROGRAM} ${${name}_FOP_ARGS} - ${${name}_SOURCE} ${DOCS_OUTPUT_DIR}/${name}.pdf + add_custom_command(OUTPUT "${name}.pdf" + COMMAND "${FOP_PROGRAM}" ${${name}_FOP_ARGS} + "${${name}_SOURCE}" "${DOCS_OUTPUT_DIR}/${name}.pdf" COMMENT "Generating PDF file ${name}.pdf from ${${name}_SOURCE}." - DEPENDS ${${name}_SOURCE} ${${name}_DEPENDENCIES}) + DEPENDS "${${name}_SOURCE}" ${${name}_DEPENDENCIES} + VERBATIM) endmacro() # DocBook -> HTML @@ -288,7 +294,7 @@ else() if(NOT BOOST_ROOT) set(BOOST_ROOT_FOR_DOCS ".") else() - set(BOOST_ROOT_FOR_DOCS ${BOOST_ROOT}) + set(BOOST_ROOT_FOR_DOCS "${BOOST_ROOT}") endif() hpx_debug("hpx_docbook_to_html.${name}" "SINGLEPAGE: ${${name}_SINGLEPAGE}") @@ -302,11 +308,11 @@ else() if(${${name}_SINGLEPAGE}) set(main_xsl_script "html-single.xsl") set(main_xsl_script_output "${DOCS_OUTPUT_DIR}/${name}.html") - set(main_xsl_script_manifest ${name}_singlepage_HTML.manifest) + set(main_xsl_script_manifest "${name}_singlepage_HTML.manifest") else() set(main_xsl_script "html.xsl") set(main_xsl_script_output "${DOCS_OUTPUT_DIR}/") - set(main_xsl_script_manifest ${name}_HTML.manifest) + set(main_xsl_script_manifest "${name}_HTML.manifest") endif() hpx_debug("hpx_docbook_to_html.${name}" "main_xsl_script: ${main_xsl_script}") @@ -315,7 +321,7 @@ else() if(WIN32) add_custom_command(OUTPUT ${main_xsl_script_manifest} COMMAND set XML_CATALOG_FILES=${${name}_CATALOG} - COMMAND ${XSLTPROC_PROGRAM} ${${name}_XSLTPROC_ARGS} + COMMAND "${XSLTPROC_PROGRAM}" ${${name}_XSLTPROC_ARGS} "--stringparam" "boost.graphics.root" "images/" "--stringparam" "admon.graphics.path" "images/" "--stringparam" "boost.root" "${BOOST_ROOT_FOR_DOCS}" @@ -323,13 +329,14 @@ else() "--stringparam" "manifest" "${CMAKE_CURRENT_BINARY_DIR}/${main_xsl_script_manifest}" "--xinclude" "-o" "${main_xsl_script_output}" - "--path" ${CMAKE_CURRENT_BINARY_DIR} - ${BOOSTBOOK_XSL_PATH}/${main_xsl_script} ${${name}_SOURCE} + "--path" "${CMAKE_CURRENT_BINARY_DIR}" + "${BOOSTBOOK_XSL_PATH}/${main_xsl_script}" "${${name}_SOURCE}" COMMENT "Generating HTML from ${${name}_SOURCE}." - DEPENDS ${${name}_SOURCE} ${${name}_DEPENDENCIES}) + DEPENDS "${${name}_SOURCE}" ${${name}_DEPENDENCIES} + VERBATIM) else() add_custom_command(OUTPUT ${main_xsl_script_manifest} - COMMAND "XML_CATALOG_FILES=${${name}_CATALOG}" ${XSLTPROC_PROGRAM} + COMMAND "XML_CATALOG_FILES=${${name}_CATALOG}" "${XSLTPROC_PROGRAM}" ${${name}_XSLTPROC_ARGS} "--stringparam" "boost.graphics.root" "images/" "--stringparam" "admon.graphics.path" "images/" @@ -338,10 +345,11 @@ else() "--stringparam" "manifest" "${CMAKE_CURRENT_BINARY_DIR}/${main_xsl_script_manifest}" "--xinclude" "-o" "${main_xsl_script_output}" - "--path" ${CMAKE_CURRENT_BINARY_DIR} - ${BOOSTBOOK_XSL_PATH}/${main_xsl_script} ${${name}_SOURCE} + "--path" "${CMAKE_CURRENT_BINARY_DIR}" + "${BOOSTBOOK_XSL_PATH}/${main_xsl_script}" "${${name}_SOURCE}" COMMENT "Generating HTML from ${${name}_SOURCE}." - DEPENDS ${${name}_SOURCE} ${${name}_DEPENDENCIES}) + DEPENDS "${${name}_SOURCE}" ${${name}_DEPENDENCIES} + VERBATIM) endif() endmacro() @@ -356,22 +364,22 @@ else() ${name}_DEPENDENCIES) hpx_quickbook_to_boostbook(${name} - SOURCE ${${name}_SOURCE} + SOURCE "${${name}_SOURCE}" DEPENDENCIES ${${name}_DEPENDENCIES} QUICKBOOK_ARGS ${${name}_QUICKBOOK_ARGS}) hpx_boostbook_to_docbook(${name} - SOURCE ${name}.xml + SOURCE "${name}.xml" CATALOG ${${name}_CATALOG} XSLTPROC_ARGS ${${name}_XSLTPROC_ARGS}) - set(docbook_source ${name}.dbk) + set(docbook_source "${name}.dbk") if(BOOSTAUTOINDEX_FOUND) hpx_generate_auto_index(${name} - INDEX ${${name}_INDEX} - SOURCE ${name}.dbk + INDEX "${${name}_INDEX}" + SOURCE "${name}.dbk" AUTOINDEX_ARGS ${${name}_AUTOINDEX_ARGS}) - set(docbook_source ${name}_auto_index.dbk) + set(docbook_source "${name}_auto_index.dbk") endif() hpx_debug("hpx_quickbook_to_html.${name}" "SINGLEPAGE: ${${name}_SINGLEPAGE}") @@ -411,11 +419,12 @@ else() "source_to_doxygen.${name}" "Doxygen dependencies" ${name}_DEPENDENCIES) - add_custom_command(OUTPUT ${name}/index.xml - COMMAND ${DOXYGEN_PROGRAM} ${${name}_DOXYGEN_ARGS} - ${CMAKE_CURRENT_BINARY_DIR}/${name}.doxy + add_custom_command(OUTPUT "${name}/index.xml" + COMMAND "${DOXYGEN_PROGRAM}" ${${name}_DOXYGEN_ARGS} + "${CMAKE_CURRENT_BINARY_DIR}/${name}.doxy" COMMENT "Generating Doxygen." - DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${name}.doxy ${${name}_DEPENDENCIES}) + DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/${name}.doxy" ${${name}_DEPENDENCIES} + VERBATIM) endmacro() # Collect chunked Doxygen XML @@ -423,25 +432,27 @@ else() hpx_parse_arguments(${name} "SOURCE;DEPENDENCIES;CATALOG;XSLTPROC_ARGS" "" ${ARGN}) if(WIN32) - add_custom_command(OUTPUT ${name}.doxygen.xml + add_custom_command(OUTPUT "${name}.doxygen.xml" COMMAND set XML_CATALOG_FILES=${${name}_CATALOG} - COMMAND ${XSLTPROC_PROGRAM} ${${name}_XSLTPROC_ARGS} - "--stringparam" "doxygen.xml.path" ${CMAKE_CURRENT_BINARY_DIR}/${name} - "--xinclude" "-o" ${name}.doxygen.xml - "--path" ${CMAKE_CURRENT_BINARY_DIR} - ${BOOSTBOOK_XSL_PATH}/doxygen/collect.xsl ${${name}_SOURCE} + COMMAND "${XSLTPROC_PROGRAM}" ${${name}_XSLTPROC_ARGS} + "--stringparam" "doxygen.xml.path" "${CMAKE_CURRENT_BINARY_DIR}/${name}" + "--xinclude" "-o" "${name}.doxygen.xml" + "--path" "${CMAKE_CURRENT_BINARY_DIR}" + "${BOOSTBOOK_XSL_PATH}/doxygen/collect.xsl" "${${name}_SOURCE}" COMMENT "Collecting Doxygen XML files." - DEPENDS ${${name}_SOURCE} ${${name}_DEPENDENCIES}) + DEPENDS "${${name}_SOURCE}" ${${name}_DEPENDENCIES} + VERBATIM) else() - add_custom_command(OUTPUT ${name}.doxygen.xml - COMMAND "XML_CATALOG_FILES=${${name}_CATALOG}" ${XSLTPROC_PROGRAM} + add_custom_command(OUTPUT "${name}.doxygen.xml" + COMMAND "XML_CATALOG_FILES=${${name}_CATALOG}" "${XSLTPROC_PROGRAM}" ${${name}_XSLTPROC_ARGS} - "--stringparam" "doxygen.xml.path" ${CMAKE_CURRENT_BINARY_DIR}/${name} - "--xinclude" "-o" ${name}.doxygen.xml - "--path" ${CMAKE_CURRENT_BINARY_DIR} - ${BOOSTBOOK_XSL_PATH}/doxygen/collect.xsl ${${name}_SOURCE} + "--stringparam" "doxygen.xml.path" "${CMAKE_CURRENT_BINARY_DIR}/${name}" + "--xinclude" "-o" "${name}.doxygen.xml" + "--path" "${CMAKE_CURRENT_BINARY_DIR}" + "${BOOSTBOOK_XSL_PATH}/doxygen/collect.xsl" "${${name}_SOURCE}" COMMENT "Collecting Doxygen XML files." - DEPENDS ${${name}_SOURCE} ${${name}_DEPENDENCIES}) + DEPENDS "${${name}_SOURCE}" ${${name}_DEPENDENCIES} + VERBATIM) endif() endmacro() @@ -450,27 +461,29 @@ else() hpx_parse_arguments(${name} "SOURCE;DEPENDENCIES;CATALOG;XSLTPROC_ARGS" "" ${ARGN}) if(WIN32) - add_custom_command(OUTPUT ${name}.xml + add_custom_command(OUTPUT "${name}.xml" COMMAND set XML_CATALOG_FILES=${${name}_CATALOG} - COMMAND ${XSLTPROC_PROGRAM} ${${name}_XSLTPROC_ARGS} + COMMAND "${XSLTPROC_PROGRAM}" ${${name}_XSLTPROC_ARGS} "--stringparam" "boost.doxygen.header.prefix" "hpx" - "--xinclude" "-o" ${name}.xml - "--path" ${CMAKE_CURRENT_BINARY_DIR} - ${BOOSTBOOK_XSL_PATH}/doxygen/doxygen2boostbook.xsl - ${${name}_SOURCE} + "--xinclude" "-o" "${name}.xml" + "--path" "${CMAKE_CURRENT_BINARY_DIR}" + "${BOOSTBOOK_XSL_PATH}/doxygen/doxygen2boostbook.xsl" + "${${name}_SOURCE}" COMMENT "Generating BoostBook XML file ${name}.xml from ${${name}_SOURCE}." - DEPENDS ${${name}_SOURCE} ${${name}_DEPENDENCIES}) + DEPENDS "${${name}_SOURCE}" ${${name}_DEPENDENCIES} + VERBATIM) else() - add_custom_command(OUTPUT ${name}.xml - COMMAND "XML_CATALOG_FILES=${${name}_CATALOG}" ${XSLTPROC_PROGRAM} + add_custom_command(OUTPUT "${name}.xml" + COMMAND "XML_CATALOG_FILES=${${name}_CATALOG}" "${XSLTPROC_PROGRAM}" ${${name}_XSLTPROC_ARGS} "--stringparam" "boost.doxygen.header.prefix" "hpx" - "--xinclude" "-o" ${name}.xml - "--path" ${CMAKE_CURRENT_BINARY_DIR} - ${BOOSTBOOK_XSL_PATH}/doxygen/doxygen2boostbook.xsl - ${${name}_SOURCE} + "--xinclude" "-o" "${name}.xml" + "--path" "${CMAKE_CURRENT_BINARY_DIR}" + "${BOOSTBOOK_XSL_PATH}/doxygen/doxygen2boostbook.xsl" + "${${name}_SOURCE}" COMMENT "Generating BoostBook XML file ${name}.xml from ${${name}_SOURCE}." - DEPENDS ${${name}_SOURCE} ${${name}_DEPENDENCIES}) + DEPENDS "${${name}_SOURCE}" ${${name}_DEPENDENCIES} + VERBATIM) endif() endmacro() @@ -485,17 +498,17 @@ else() DOXYGEN_ARGS ${${name}_DOXYGEN_ARGS}) hpx_collect_doxygen(${name} - SOURCE ${name}/index.xml + SOURCE "${name}/index.xml" CATALOG ${${name}_CATALOG} XSLTPROC_ARGS ${${name}_XSLTPROC_ARGS}) hpx_doxygen_to_boostbook(${name} - SOURCE ${name}.doxygen.xml + SOURCE "${name}.doxygen.xml" CATALOG ${${name}_CATALOG} XSLTPROC_ARGS ${${name}_XSLTPROC_ARGS}) if(${name}_TARGET) - add_custom_target(${${name}_TARGET} DEPENDS ${name}.xml + add_custom_target(${${name}_TARGET} DEPENDS "${name}.xml" DEPENDENCIES ${${name}_DEPENDENCIES}) endif() endmacro() @@ -517,16 +530,17 @@ else() if(input_path STREQUAL "") set(input_path "${CMAKE_CURRENT_SOURCE_DIR}/${${name}_INDEX}") else() - set(input_path ${${name}_INDEX}) + set(input_path "${${name}_INDEX}") endif() - add_custom_command(OUTPUT ${name}_auto_index.dbk - COMMAND ${BOOSTAUTOINDEX_PROGRAM} ${${name}_AUTOINDEX_ARGS} + add_custom_command(OUTPUT "${name}_auto_index.dbk" + COMMAND "${BOOSTAUTOINDEX_PROGRAM}" ${${name}_AUTOINDEX_ARGS} "--script=${input_path}" "--in=${${name}_SOURCE}" "--out=${name}_auto_index.dbk" COMMENT "Generating auto index." - DEPENDS ${${name}_SOURCE} ${${name}_INDEX}) + DEPENDS "${${name}_SOURCE}" "${${name}_INDEX}" + VERBATIM) endmacro() endif() diff --git a/cmake/HPX_FindPackage.cmake b/cmake/HPX_FindPackage.cmake index 9bcfbec64fde..8a265978a8cb 100644 --- a/cmake/HPX_FindPackage.cmake +++ b/cmake/HPX_FindPackage.cmake @@ -22,7 +22,7 @@ macro(hpx_find_headers name) # ${name}_USE_SYSTEM is not defined. if(NOT ${name}_USE_SYSTEM) if(NOT ${name}_ROOT AND NOT $ENV{${name}_ROOT} STREQUAL "") - set(${name}_ROOT $ENV{${name}_ROOT}) + set(${name}_ROOT "$ENV{${name}_ROOT}") endif() endif() @@ -69,7 +69,7 @@ macro(hpx_find_package name) if(NOT ${name}_ROOT) set(${name}_ROOT ${name}_ROOT-NOTFOUND) else() - string(REPLACE "\\" "/" ${name}_ROOT ${${name}_ROOT}) + string(REPLACE "\\" "/" ${name}_ROOT "${${name}_ROOT}") endif() if(NOT ${name}_LIBRARY) @@ -86,10 +86,10 @@ macro(hpx_find_package name) set(${name}_FOUND OFF CACHE BOOL "Found ${name}.") - set(${name}_ROOT ${${name}_ROOT} CACHE PATH "${name} root directory.") - set(${name}_LIBRARY ${${name}_LIBRARY} CACHE FILEPATH "${name} shared library.") - set(${name}_LIBRARY_DIR ${${name}_LIBRARY_DIR} CACHE PATH "${name} library directory.") - set(${name}_INCLUDE_DIR ${${name}_INCLUDE_DIR} CACHE PATH "${name} include directory.") + set(${name}_ROOT "${${name}_ROOT}" CACHE PATH "${name} root directory.") + set(${name}_LIBRARY "${${name}_LIBRARY}" CACHE FILEPATH "${name} shared library.") + set(${name}_LIBRARY_DIR "${${name}_LIBRARY_DIR}" CACHE PATH "${name} library directory.") + set(${name}_INCLUDE_DIR "${${name}_INCLUDE_DIR}" CACHE PATH "${name} include directory.") mark_as_advanced(FORCE ${name}_FOUND ${name}_ROOT @@ -145,8 +145,8 @@ macro(hpx_find_package name) DEFAULT_MSG ${name}_LIBRARY ${name}_INCLUDE_DIR) if(${name}_FOUND) - get_filename_component(${name}_ROOT ${${name}_INCLUDE_DIR} PATH) - get_filename_component(${name}_LIBRARY_DIR ${${name}_LIBRARY} PATH) + get_filename_component(${name}_ROOT "${${name}_INCLUDE_DIR}" PATH) + get_filename_component(${name}_LIBRARY_DIR "${${name}_LIBRARY}" PATH) set(${name}_FOUND ON CACHE BOOL "Found ${name}." FORCE) else() @@ -169,10 +169,10 @@ macro(hpx_find_package name) set(${name}_FOUND OFF CACHE BOOL "Found ${name}." FORCE) endif() - set(${name}_ROOT ${${name}_ROOT} CACHE PATH "${name} root directory.") - set(${name}_LIBRARY ${${name}_LIBRARY} CACHE FILEPATH "${name} shared library.") - set(${name}_LIBRARY_DIR ${${name}_LIBRARY_DIR} CACHE PATH "${name} library directory.") - set(${name}_INCLUDE_DIR ${${name}_INCLUDE_DIR} CACHE PATH "${name} include directory.") + set(${name}_ROOT "${${name}_ROOT}" CACHE PATH "${name} root directory.") + set(${name}_LIBRARY "${${name}_LIBRARY}" CACHE FILEPATH "${name} shared library.") + set(${name}_LIBRARY_DIR "${${name}_LIBRARY_DIR}" CACHE PATH "${name} library directory.") + set(${name}_INCLUDE_DIR "${${name}_INCLUDE_DIR}" CACHE PATH "${name} include directory.") mark_as_advanced(FORCE ${name}_FOUND diff --git a/cmake/HPX_FindPath.cmake b/cmake/HPX_FindPath.cmake index 48e36eefaf6b..8800ddfe2a1a 100644 --- a/cmake/HPX_FindPath.cmake +++ b/cmake/HPX_FindPath.cmake @@ -24,7 +24,7 @@ macro(hpx_find_path name) set(rooted_paths) foreach(path ${${name}_FILE_PATHS}) - list(APPEND rooted_paths ${${name}_ROOT}/${path}) + list(APPEND rooted_paths "${${name}_ROOT}/${path}") endforeach() if(${name}_ROOT) @@ -67,8 +67,8 @@ macro(hpx_find_path name) if(${name}_PATH) set(${name}_PATH_FOUND ON CACHE BOOL "Found ${name} path.") - set(${name}_ROOT ${${name}_ROOT} CACHE PATH "${name} root directory.") - set(${name}_PATH ${${name}_FILE} CACHE FILEPATH "Path to ${name} file.") + set(${name}_ROOT "${${name}_ROOT}" CACHE PATH "${name} root directory.") + set(${name}_PATH "${${name}_FILE}" CACHE FILEPATH "Path to ${name} file.") mark_as_advanced(FORCE ${name}_ROOT ${name}_PATH) endif() endif() diff --git a/cmake/HPX_FindProgram.cmake b/cmake/HPX_FindProgram.cmake index 24dd637969b6..d48b95ad4f58 100644 --- a/cmake/HPX_FindProgram.cmake +++ b/cmake/HPX_FindProgram.cmake @@ -24,7 +24,7 @@ macro(hpx_find_program name) set(rooted_paths) foreach(path ${${name}_PROGRAM_PATHS}) - list(APPEND rooted_paths ${${name}_ROOT}/${path}) + list(APPEND rooted_paths "${${name}_ROOT}/${path}") endforeach() if(${name}_ROOT) @@ -67,8 +67,8 @@ macro(hpx_find_program name) if(${name}_PROGRAM) set(${name}_FOUND ON CACHE BOOL "Found ${name}." FORCE) - set(${name}_ROOT ${${name}_ROOT} CACHE PATH "${name} root directory.") - set(${name}_PROGRAM ${${name}_PROGRAM} CACHE FILEPATH "${name} program.") + set(${name}_ROOT "${${name}_ROOT}" CACHE PATH "${name} root directory.") + set(${name}_PROGRAM "${${name}_PROGRAM}" CACHE FILEPATH "${name} program.") endif() mark_as_advanced(FORCE ${name}_ROOT ${name}_PROGRAM) diff --git a/cmake/HPX_GCCVersion.cmake b/cmake/HPX_GCCVersion.cmake index 73ed72017261..432d00d5da11 100644 --- a/cmake/HPX_GCCVersion.cmake +++ b/cmake/HPX_GCCVersion.cmake @@ -22,12 +22,12 @@ if(NOT MSVC) set(source_dir "$ENV{HPX_ROOT}/share/hpx/cmake/tests") endif() - file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/${CMAKE_FILES_DIRECTORY}/config_tests) + file(MAKE_DIRECTORY "${CMAKE_BINARY_DIR}/${CMAKE_FILES_DIRECTORY}/config_tests") - hpx_compile(gcc_version SOURCE ${source_dir}/gcc_version.cpp + hpx_compile(gcc_version SOURCE "${source_dir}/gcc_version.cpp" LANGUAGE CXX - OUTPUT ${CMAKE_BINARY_DIR}/${CMAKE_FILES_DIRECTORY}/config_tests/gcc_version - FLAGS -I${BOOST_INCLUDE_DIR} ${include_dir}) + OUTPUT "${CMAKE_BINARY_DIR}/${CMAKE_FILES_DIRECTORY}/config_tests/gcc_version" + FLAGS "-I${BOOST_INCLUDE_DIR}" "${include_dir}") if("${gcc_version_RESULT}" STREQUAL "0") if(NOT GCC_VERSION) diff --git a/cmake/HPX_GFortranVersion.cmake b/cmake/HPX_GFortranVersion.cmake index 61d3cb75c0ca..a728ac21f1c7 100644 --- a/cmake/HPX_GFortranVersion.cmake +++ b/cmake/HPX_GFortranVersion.cmake @@ -22,11 +22,11 @@ if(NOT MSVC) set(source_dir "$ENV{HPX_ROOT}/share/hpx/cmake/tests") endif() - file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/${CMAKE_FILES_DIRECTORY}/config_tests) + file(MAKE_DIRECTORY "${CMAKE_BINARY_DIR}/${CMAKE_FILES_DIRECTORY}/config_tests") - hpx_compile(gfortran_version SOURCE ${source_dir}/gfortran_version.fpp + hpx_compile(gfortran_version SOURCE "${source_dir}/gfortran_version.fpp" LANGUAGE Fortran - OUTPUT ${CMAKE_BINARY_DIR}/${CMAKE_FILES_DIRECTORY}/config_tests/gfortran_version) + OUTPUT "${CMAKE_BINARY_DIR}/${CMAKE_FILES_DIRECTORY}/config_tests/gfortran_version") if("${gfortran_version_RESULT}" STREQUAL "0") execute_process( diff --git a/cmake/HPX_GitCommit.cmake b/cmake/HPX_GitCommit.cmake index 9d26ba5e3489..0ccd243a7ab4 100644 --- a/cmake/HPX_GitCommit.cmake +++ b/cmake/HPX_GitCommit.cmake @@ -11,7 +11,7 @@ hpx_include(Message) execute_process( COMMAND "git" "log" "--pretty=%H" "-1" "${hpx_SOURCE_DIR}" - WORKING_DIRECTORY ${hpx_SOURCE_DIR} + WORKING_DIRECTORY "${hpx_SOURCE_DIR}" OUTPUT_VARIABLE HPX_GIT_COMMIT ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE) if(NOT HPX_GIT_COMMIT OR "${HPX_GIT_COMMIT}" STREQUAL "None") diff --git a/cmake/HPX_Install.cmake b/cmake/HPX_Install.cmake index 3ce59e964278..ea9366c383e8 100644 --- a/cmake/HPX_Install.cmake +++ b/cmake/HPX_Install.cmake @@ -48,8 +48,8 @@ endmacro() macro(hpx_library_install name suffix) if(NOT HPX_NO_INSTALL) - hpx_get_target_file(lib ${name}) - hpx_get_target_path(output_dir ${name}) + hpx_get_target_file(lib "${name}") + hpx_get_target_path(output_dir "${name}") if(UNIX) set(targets ${lib} ${lib}.${HPX_SOVERSION} ${lib}.${HPX_VERSION}) @@ -85,7 +85,7 @@ endmacro() macro(hpx_archive_install name suffix) if(NOT HPX_NO_INSTALL) - hpx_get_target_location(location ${name}) + hpx_get_target_location(location "${name}") set(target_directory "${CMAKE_INSTALL_PREFIX}/${suffix}") diff --git a/cmake/HPX_ParseArguments.cmake b/cmake/HPX_ParseArguments.cmake index 0a7210914471..f71786da5e25 100644 --- a/cmake/HPX_ParseArguments.cmake +++ b/cmake/HPX_ParseArguments.cmake @@ -15,11 +15,11 @@ macro(hpx_parse_arguments prefix arg_names option_names) set(DEFAULT_ARGS) foreach(arg_name ${arg_names}) - set(${prefix}_${arg_name}) + set("${prefix}_${arg_name}") endforeach() foreach(option ${option_names}) - set(${prefix}_${option} FALSE) + set("${prefix}_${option}" FALSE) endforeach() set(current_arg_name DEFAULT_ARGS) @@ -28,13 +28,13 @@ macro(hpx_parse_arguments prefix arg_names option_names) foreach(arg ${ARGN}) hpx_list_contains(is_arg_name ${arg} ${arg_names}) if(is_arg_name) - set(${prefix}_${current_arg_name} ${current_arg_list}) + set("${prefix}_${current_arg_name}" ${current_arg_list}) set(current_arg_name ${arg}) set(current_arg_list) else() hpx_list_contains(is_option ${arg} ${option_names}) if(is_option) - set(${prefix}_${arg} TRUE) + set("${prefix}_${arg}" TRUE) else() set(current_arg_list ${current_arg_list} ${arg}) endif() @@ -43,20 +43,20 @@ macro(hpx_parse_arguments prefix arg_names option_names) foreach(arg ${arg_names}) if(${arg}) - if(NOT ${prefix}_${arg}) - set(${prefix}_${arg} ${${arg}}) + if(NOT "${prefix}_${arg}") + set("${prefix}_${arg}" ${${arg}}) endif() endif() endforeach() foreach(option ${option_names}) if(${option}) - if(NOT ${prefix}_${option}) - set(${prefix}_${option} TRUE) + if(NOT "${prefix}_${option}") + set("${prefix}_${option}" TRUE) endif() endif() endforeach() - set(${prefix}_${current_arg_name} ${current_arg_list}) + set("${prefix}_${current_arg_name}" ${current_arg_list}) endmacro() diff --git a/cmake/HPX_Preprocessing.cmake b/cmake/HPX_Preprocessing.cmake index 8ca4aee46e0e..92b9caeceda1 100644 --- a/cmake/HPX_Preprocessing.cmake +++ b/cmake/HPX_Preprocessing.cmake @@ -32,36 +32,36 @@ else() endif() macro(hpx_partial_preprocess_header file) - hpx_list_contains(FILE_ADDED_ALREADY ${file} ${HPX_PREPROCESS_HEADERS}) + hpx_list_contains(FILE_ADDED_ALREADY "${file}" ${HPX_PREPROCESS_HEADERS}) - get_property(include_dirs DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY INCLUDE_DIRECTORIES) + get_property(include_dirs DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}" PROPERTY INCLUDE_DIRECTORIES) set(include_dirs ${include_dirs} ${CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES}) foreach(dir ${include_dirs}) - hpx_list_contains(INCLUDE_DIR_ADDED_ALREADY ${dir} ${HPX_PREPROCESS_INCLUDE_DIRS}) + hpx_list_contains(INCLUDE_DIR_ADDED_ALREADY "${dir}" ${HPX_PREPROCESS_INCLUDE_DIRS}) if(NOT INCLUDE_DIR_ADDED_ALREADY) hpx_debug("preprocessing" "Adding ${dir} to list of additional include directories") - set(HPX_PREPROCESS_INCLUDE_DIRS ${HPX_PREPROCESS_INCLUDE_DIRS} ${dir} CACHE INTERNAL "") + set(HPX_PREPROCESS_INCLUDE_DIRS ${HPX_PREPROCESS_INCLUDE_DIRS} "${dir}" CACHE INTERNAL "") endif() endforeach() if(NOT FILE_ADDED_ALREADY) hpx_debug("preprocessing" "Adding ${file} to list of targets to preprocess") set(HPX_PREPROCESS_HEADERS ${HPX_PREPROCESS_HEADERS} ${file} CACHE INTERNAL "") - hpx_parse_arguments(HPX_PREPROCESS_HEADERS_${file} "GUARD;LIMIT" "" ${ARGN}) - if(HPX_PREPROCESS_HEADERS_${file}_LIMIT) - set(HPX_PREPROCESS_HEADERS_${file}_LIMIT ${HPX_PREPROCESS_HEADERS_${file}_LIMIT} CACHE INTERNAL "" FORCE) + hpx_parse_arguments("HPX_PREPROCESS_HEADERS_${file}" "GUARD;LIMIT" "" ${ARGN}) + if("HPX_PREPROCESS_HEADERS_${file}_LIMIT") + set("HPX_PREPROCESS_HEADERS_${file}_LIMIT" "${HPX_PREPROCESS_HEADERS_${file}_LIMIT}" CACHE INTERNAL "" FORCE) else() - set(HPX_PREPROCESS_HEADERS_${file}_LIMIT "HPX_LIMIT" CACHE INTERNAL "" FORCE) + set("HPX_PREPROCESS_HEADERS_${file}_LIMIT" "HPX_LIMIT" CACHE INTERNAL "" FORCE) endif() - if(HPX_PREPROCESS_HEADERS_${file}_GUARD) - set(HPX_PREPROCESS_HEADERS_${file}_GUARD ${HPX_PREPROCESS_HEADERS_${file}_GUARD} CACHE INTERNAL "" FORCE) + if("HPX_PREPROCESS_HEADERS_${file}_GUARD") + set("HPX_PREPROCESS_HEADERS_${file}_GUARD" "${HPX_PREPROCESS_HEADERS_${file}_GUARD}" CACHE INTERNAL "" FORCE) else() string(TOUPPER "${file}" THIS_GUARD) string(REGEX REPLACE "/" "_" THIS_GUARD "${THIS_GUARD}") string(REGEX REPLACE "\\." "_" THIS_GUARD "${THIS_GUARD}") string(REGEX REPLACE "HPX_" "HPX_PREPROCESSED_" THIS_GUARD "${THIS_GUARD}") - set(HPX_PREPROCESS_HEADERS_${file}_GUARD ${THIS_GUARD} CACHE INTERNAL "" FORCE) + set("HPX_PREPROCESS_HEADERS_${file}_GUARD" "${THIS_GUARD}" CACHE INTERNAL "" FORCE) endif() endif() endmacro() @@ -78,10 +78,10 @@ else() set(HPX_PREPROCESS_GUARD ${HPX_PREPROCESS_HEADERS_${file}_GUARD}) get_filename_component(PREPROCESS_DIR "${file}" PATH) get_filename_component(PREPROCESS_HEADER "${file}" NAME_WE) - set(HPX_PREPROCESS_HEADER ${PREPROCESS_DIR}/preprocessed/${PREPROCESS_HEADER}) + set(HPX_PREPROCESS_HEADER "${PREPROCESS_DIR}/preprocessed/${PREPROCESS_HEADER}") configure_file( - ${hpx_SOURCE_DIR}/cmake/templates/preprocess_include.hpp.in - ${hpx_SOURCE_DIR}/${HPX_PREPROCESS_HEADER}.hpp + "${hpx_SOURCE_DIR}/cmake/templates/preprocess_include.hpp.in" + "${hpx_SOURCE_DIR}/${HPX_PREPROCESS_HEADER}.hpp" ESCAPE_QUOTES @ONLY ) @@ -139,19 +139,19 @@ else() set(HPX_WAVE_ARGUMENTS "${HPX_WAVE_ARGUMENTS}-D__GXX_EXPERIMENTAL_CXX0X__\n") endif() - set(output_dir ${CMAKE_BINARY_DIR}) + set(output_dir "${CMAKE_BINARY_DIR}") hpx_info("preprocessing" "output_dir: ${output_dir}") configure_file( - ${hpx_SOURCE_DIR}/cmake/templates/wave.cfg.in - ${output_dir}/preprocess/wave.cfg + "${hpx_SOURCE_DIR}/cmake/templates/wave.cfg.in" + "${output_dir}/preprocess/wave.cfg" ESCAPE_QUOTES @ONLY ) configure_file( - ${hpx_SOURCE_DIR}/cmake/templates/preprocess_hpx.cpp.in - ${output_dir}/preprocess/preprocess_hpx.cpp + "${hpx_SOURCE_DIR}/cmake/templates/preprocess_hpx.cpp.in" + "${output_dir}/preprocess/preprocess_hpx.cpp" ESCAPE_QUOTES @ONLY ) @@ -160,22 +160,23 @@ else() set(HPX_PREPROCESSING_LIMITS ${HPX_PREPROCESSING_LIMITS} "hpx_partial_preprocess_headers_${limit}") add_custom_command( - OUTPUT ${output_dir}/preprocess/hpx_preprocessed_${limit}.touch - COMMAND ${BOOSTWAVE_PROGRAM} - ARGS -o- -DHPX_LIMIT=${limit} ${output_dir}/preprocess/preprocess_hpx.cpp --license=${hpx_SOURCE_DIR}/preprocess/preprocess_license.hpp --config-file ${output_dir}/preprocess/wave.cfg + OUTPUT "${output_dir}/preprocess/hpx_preprocessed_${limit}.touch" + COMMAND "${BOOSTWAVE_PROGRAM}" + ARGS -o- "-DHPX_LIMIT=${limit}" "${output_dir}/preprocess/preprocess_hpx.cpp" "--license=${hpx_SOURCE_DIR}/preprocess/preprocess_license.hpp" --config-file "${output_dir}/preprocess/wave.cfg" + VERBATIM ) add_custom_target( - hpx_partial_preprocess_headers_${limit} - DEPENDS ${output_dir}/preprocess/hpx_preprocessed_${limit}.touch + "hpx_partial_preprocess_headers_${limit}" + DEPENDS "${output_dir}/preprocess/hpx_preprocessed_${limit}.touch" ) - set_target_properties(hpx_partial_preprocess_headers_${limit} + set_target_properties("hpx_partial_preprocess_headers_${limit}" PROPERTIES FOLDER "Preprocessing/Dependencies") endforeach() add_custom_target( hpx_partial_preprocess_headers DEPENDS ${HPX_PREPROCESSING_LIMITS} - WORKING_DIRECTORY ${output_dir}/preprocess + WORKING_DIRECTORY "${output_dir}/preprocess" ) set_target_properties(hpx_partial_preprocess_headers PROPERTIES FOLDER "Preprocessing") diff --git a/cmake/HPX_SetAllocator.cmake b/cmake/HPX_SetAllocator.cmake index 5281be6d1639..4c19b31a202d 100644 --- a/cmake/HPX_SetAllocator.cmake +++ b/cmake/HPX_SetAllocator.cmake @@ -35,8 +35,8 @@ if("${HPX_MALLOC_UPPER}" STREQUAL "TCMALLOC") if(MSVC) set(HPX_LINK_FLAG_TARGET_PROPERTIES "/INCLUDE:__tcmalloc") endif() - hpx_include_sys_directories(${TCMALLOC_INCLUDE_DIR}) - hpx_link_sys_directories(${TCMALLOC_LIBRARY_DIR}) + hpx_include_sys_directories("${TCMALLOC_INCLUDE_DIR}") + hpx_link_sys_directories("${TCMALLOC_LIBRARY_DIR}") hpx_add_config_define(HPX_TCMALLOC) set(HPX_USE_CUSTOM_ALLOCATOR On) endif() @@ -51,8 +51,8 @@ if("${HPX_MALLOC_UPPER}" STREQUAL "JEMALLOC") endif() set(hpx_MALLOC_LIBRARY ${JEMALLOC_LIBRARY}) set(hpx_LIBRARIES ${hpx_LIBRARIES} ${JEMALLOC_LIBRARY}) - hpx_include_sys_directories(${JEMALLOC_INCLUDE_DIR}) - hpx_link_sys_directories(${JEMALLOC_LIBRARY_DIR}) + hpx_include_sys_directories("${JEMALLOC_INCLUDE_DIR}") + hpx_link_sys_directories("${JEMALLOC_LIBRARY_DIR}") hpx_add_config_define(HPX_JEMALLOC) set(HPX_USE_CUSTOM_ALLOCATOR On) endif() @@ -68,8 +68,8 @@ if("${HPX_MALLOC_UPPER}" STREQUAL "TBBMALLOC") set(hpx_MALLOC_LIBRARY "${TBBMALLOC_LIBRARY};${TBBMALLOC_PROXY_LIBRARY}") set(hpx_LIBRARIES ${hpx_LIBRARIES} ${TBBMALLOC_LIBRARY}) set(hpx_LIBRARIES ${hpx_LIBRARIES} ${TBBMALLOC_PROXY_LIBRARY}) - hpx_include_sys_directories(${TBBMALLOC_INCLUDE_DIR}) - hpx_link_sys_directories(${TBBMALLOC_LIBRARY_DIR}) + hpx_include_sys_directories("${TBBMALLOC_INCLUDE_DIR}") + hpx_link_sys_directories("${TBBMALLOC_LIBRARY_DIR}") hpx_add_config_define(HPX_TBBMALLOC) endif() diff --git a/cmake/HPX_SetOutputPaths.cmake b/cmake/HPX_SetOutputPaths.cmake index 4803462e414c..23f0455cd62d 100644 --- a/cmake/HPX_SetOutputPaths.cmake +++ b/cmake/HPX_SetOutputPaths.cmake @@ -6,20 +6,20 @@ set(HPX_SET_OUTPUT_PATH ON) if(MSVC) - set(HPX_RUNTIME_OUTPUT_DIRECTORY_RELEASE ${CMAKE_BINARY_DIR}/Release/bin) - set(HPX_LIBRARY_OUTPUT_DIRECTORY_RELEASE ${CMAKE_BINARY_DIR}/Release/lib/hpx) - set(HPX_ARCHIVE_OUTPUT_DIRECTORY_RELEASE ${CMAKE_BINARY_DIR}/Release/lib/hpx) - set(HPX_RUNTIME_OUTPUT_DIRECTORY_DEBUG ${CMAKE_BINARY_DIR}/Debug/bin) - set(HPX_LIBRARY_OUTPUT_DIRECTORY_DEBUG ${CMAKE_BINARY_DIR}/Debug/lib/hpx) - set(HPX_ARCHIVE_OUTPUT_DIRECTORY_DEBUG ${CMAKE_BINARY_DIR}/Debug/lib/hpx) - set(HPX_RUNTIME_OUTPUT_DIRECTORY_MINSIZEREL ${CMAKE_BINARY_DIR}/MinSizeRel/bin) - set(HPX_LIBRARY_OUTPUT_DIRECTORY_MINSIZEREL ${CMAKE_BINARY_DIR}/MinSizeRel/lib/hpx) - set(HPX_ARCHIVE_OUTPUT_DIRECTORY_MINSIZEREL ${CMAKE_BINARY_DIR}/MinSizeRel/lib/hpx) - set(HPX_RUNTIME_OUTPUT_DIRECTORY_RELWITHDEBINFO ${CMAKE_BINARY_DIR}/RelWithDebInfo/bin) - set(HPX_LIBRARY_OUTPUT_DIRECTORY_RELWITHDEBINFO ${CMAKE_BINARY_DIR}/RelWithDebInfo/lib/hpx) - set(HPX_ARCHIVE_OUTPUT_DIRECTORY_RELWITHDEBINFO ${CMAKE_BINARY_DIR}/RelWithDebInfo/lib/hpx) + set(HPX_RUNTIME_OUTPUT_DIRECTORY_RELEASE "${CMAKE_BINARY_DIR}/Release/bin") + set(HPX_LIBRARY_OUTPUT_DIRECTORY_RELEASE "${CMAKE_BINARY_DIR}/Release/lib/hpx") + set(HPX_ARCHIVE_OUTPUT_DIRECTORY_RELEASE "${CMAKE_BINARY_DIR}/Release/lib/hpx") + set(HPX_RUNTIME_OUTPUT_DIRECTORY_DEBUG "${CMAKE_BINARY_DIR}/Debug/bin") + set(HPX_LIBRARY_OUTPUT_DIRECTORY_DEBUG "${CMAKE_BINARY_DIR}/Debug/lib/hpx") + set(HPX_ARCHIVE_OUTPUT_DIRECTORY_DEBUG "${CMAKE_BINARY_DIR}/Debug/lib/hpx") + set(HPX_RUNTIME_OUTPUT_DIRECTORY_MINSIZEREL "${CMAKE_BINARY_DIR}/MinSizeRel/bin") + set(HPX_LIBRARY_OUTPUT_DIRECTORY_MINSIZEREL "${CMAKE_BINARY_DIR}/MinSizeRel/lib/hpx") + set(HPX_ARCHIVE_OUTPUT_DIRECTORY_MINSIZEREL "${CMAKE_BINARY_DIR}/MinSizeRel/lib/hpx") + set(HPX_RUNTIME_OUTPUT_DIRECTORY_RELWITHDEBINFO "${CMAKE_BINARY_DIR}/RelWithDebInfo/bin") + set(HPX_LIBRARY_OUTPUT_DIRECTORY_RELWITHDEBINFO "${CMAKE_BINARY_DIR}/RelWithDebInfo/lib/hpx") + set(HPX_ARCHIVE_OUTPUT_DIRECTORY_RELWITHDEBINFO "${CMAKE_BINARY_DIR}/RelWithDebInfo/lib/hpx") else() - set(HPX_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) - set(HPX_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib/hpx) - set(HPX_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib/hpx) + set(HPX_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin") + set(HPX_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib/hpx") + set(HPX_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib/hpx") endif() diff --git a/cmake/HPX_UpdateGitDocs.cmake b/cmake/HPX_UpdateGitDocs.cmake index 0e1244cab0b9..68cefdc1e521 100644 --- a/cmake/HPX_UpdateGitDocs.cmake +++ b/cmake/HPX_UpdateGitDocs.cmake @@ -9,17 +9,17 @@ if(NOT GIT_FOUND) message(FATAL_ERROR "Could not find git. git is needed to download and update the GitHub pages.") endif() -if(EXISTS ${CMAKE_BINARY_DIR}/gh-pages) +if(EXISTS "${CMAKE_BINARY_DIR}/gh-pages") execute_process( - COMMAND ${GIT_EXECUTABLE} pull --rebase - WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/gh-pages + COMMAND "${GIT_EXECUTABLE}" pull --rebase + WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/gh-pages" RESULT_VARIABLE git_pull_result) if(NOT "${git_pull_result}" EQUAL "0") message(FATAL_ERROR "Updating the GitHub pages branch failed.") endif() else() execute_process( - COMMAND ${GIT_EXECUTABLE} clone git@github.com:STEllAR-GROUP/hpx.git --branch gh-pages gh-pages + COMMAND "${GIT_EXECUTABLE}" clone git@github.com:STEllAR-GROUP/hpx.git --branch gh-pages gh-pages RESULT_VARIABLE git_clone_result) if(NOT "${git_clone_result}" EQUAL "0") message(FATAL_ERROR "Cloning the GitHub pages branch failed.") @@ -27,37 +27,37 @@ else() endif() # first delete all html files -file(REMOVE_RECURSE ${CMAKE_BINARY_DIR}/gh-pages/docs/html/hpx) +file(REMOVE_RECURSE "${CMAKE_BINARY_DIR}/gh-pages/docs/html/hpx") # copy all documentation files to target branch file( - COPY ${HPX_SOURCE_DIR}/docs/html - DESTINATION ${CMAKE_BINARY_DIR}/gh-pages/docs) + COPY "${HPX_SOURCE_DIR}/docs/html" + DESTINATION "${CMAKE_BINARY_DIR}/gh-pages/docs") if(HPX_BUILD_TYPE) - set(doc_dir ${CMAKE_BINARY_DIR}/${HPX_BUILD_TYPE}/../share/hpx-${HPX_VERSION}) + set(doc_dir "${CMAKE_BINARY_DIR}/${HPX_BUILD_TYPE}/../share/hpx-${HPX_VERSION}") else() - set(doc_dir ${CMAKE_BINARY_DIR}/../share/hpx-${HPX_VERSION}) + set(doc_dir "${CMAKE_BINARY_DIR}/../share/hpx-${HPX_VERSION}") endif() # disable copying source files for now, this needs to be fixed... file( - COPY ${doc_dir}/docs - DESTINATION ${CMAKE_BINARY_DIR}/gh-pages) + COPY "${doc_dir}/docs" + DESTINATION "${CMAKE_BINARY_DIR}/gh-pages") # copy all source files the docs depend upon if(HPX_DOCUMENTATION_FILES) string(REPLACE " " ";" HPX_DOCUMENTATION_FILES_LIST "${HPX_DOCUMENTATION_FILES}") foreach(file ${HPX_DOCUMENTATION_FILES_LIST}) - file(COPY ${file} - DESTINATION ${CMAKE_BINARY_DIR}/gh-pages/docs/html/code) + file(COPY "${file}" + DESTINATION "${CMAKE_BINARY_DIR}/gh-pages/docs/html/code") endforeach() endif() # add all newly generated file execute_process( - COMMAND ${GIT_EXECUTABLE} add * - WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/gh-pages + COMMAND "${GIT_EXECUTABLE}" add * + WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/gh-pages" RESULT_VARIABLE git_add_result) if(NOT "${git_add_result}" EQUAL "0") message(FATAL_ERROR "Adding files to the GitHub pages branch failed.") @@ -65,14 +65,14 @@ endif() # check if there are changes to commit execute_process( - COMMAND ${GIT_EXECUTABLE} diff-index --quiet HEAD - WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/gh-pages + COMMAND "${GIT_EXECUTABLE}" diff-index --quiet HEAD + WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/gh-pages" RESULT_VARIABLE git_diff_index_result) if(NOT "${git_diff_index_result}" EQUAL "0") # commit changes execute_process( - COMMAND ${GIT_EXECUTABLE} commit -am "Updating docs" - WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/gh-pages + COMMAND "${GIT_EXECUTABLE}" commit -am "Updating docs" + WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/gh-pages" RESULT_VARIABLE git_commit_result) if(NOT "${git_commit_result}" EQUAL "0") message(FATAL_ERROR "Commiting to the GitHub pages branch failed.") @@ -80,8 +80,8 @@ if(NOT "${git_diff_index_result}" EQUAL "0") # push everything up to github execute_process( - COMMAND ${GIT_EXECUTABLE} push - WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/gh-pages + COMMAND "${GIT_EXECUTABLE}" push + WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/gh-pages" RESULT_VARIABLE git_push_result) if(NOT "${git_push_result}" EQUAL "0") message(FATAL_ERROR "Pushing to the GitHub pages branch failed.") diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt index 1fd025e6d1e9..7aa45f8d4553 100644 --- a/docs/CMakeLists.txt +++ b/docs/CMakeLists.txt @@ -3,31 +3,31 @@ # Distributed under the Boost Software License, Version 1.0. (See accompanying # file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) -hpx_write_boostbook_catalog(${CMAKE_CURRENT_BINARY_DIR}/boostbook_catalog.xml) +hpx_write_boostbook_catalog("${CMAKE_CURRENT_BINARY_DIR}/boostbook_catalog.xml") -file(GLOB base_files ${hpx_SOURCE_DIR}/docs/*.qbk) -file(GLOB_RECURSE manual_files ${hpx_SOURCE_DIR}/docs/manual/*.qbk) -file(GLOB_RECURSE tutorial_files ${hpx_SOURCE_DIR}/docs/tutorial/*.qbk) -file(GLOB_RECURSE index_files ${hpx_SOURCE_DIR}/docs/*.idx) +file(GLOB base_files "${hpx_SOURCE_DIR}/docs/*.qbk") +file(GLOB_RECURSE manual_files "${hpx_SOURCE_DIR}/docs/manual/*.qbk") +file(GLOB_RECURSE tutorial_files "${hpx_SOURCE_DIR}/docs/tutorial/*.qbk") +file(GLOB_RECURSE index_files "${hpx_SOURCE_DIR}/docs/*.idx") set(documentation_files ${manual_files} ${tutorial_files} ${base_files} ${index_files}) set(documentation_dependencies - ${hpx_SOURCE_DIR}/examples/quickstart/hello_world.cpp - ${hpx_SOURCE_DIR}/examples/quickstart/simplest_hello_world.cpp - ${hpx_SOURCE_DIR}/examples/quickstart/error_handling.cpp - ${hpx_SOURCE_DIR}/examples/accumulator/accumulators/server/managed_accumulator.hpp - ${hpx_SOURCE_DIR}/examples/accumulator/accumulators/stubs/managed_accumulator.hpp - ${hpx_SOURCE_DIR}/examples/accumulator/accumulators/managed_accumulator.hpp - ${hpx_SOURCE_DIR}/examples/accumulator/accumulators/managed_accumulator.cpp - ${hpx_SOURCE_DIR}/examples/accumulator/managed_accumulator_client.cpp - ${hpx_SOURCE_DIR}/examples/hello_world_component/hello_world_component.hpp - ${hpx_SOURCE_DIR}/examples/hello_world_component/hello_world_component.cpp - ${hpx_SOURCE_DIR}/examples/performance_counters/simplest_performance_counter.cpp - ${hpx_SOURCE_DIR}/examples/performance_counters/sine/server/sine.hpp - ${hpx_SOURCE_DIR}/hpx/performance_counters/performance_counter.hpp - ${hpx_SOURCE_DIR}/hpx/performance_counters/base_performance_counter.hpp) + "${hpx_SOURCE_DIR}/examples/quickstart/hello_world.cpp" + "${hpx_SOURCE_DIR}/examples/quickstart/simplest_hello_world.cpp" + "${hpx_SOURCE_DIR}/examples/quickstart/error_handling.cpp" + "${hpx_SOURCE_DIR}/examples/accumulator/accumulators/server/managed_accumulator.hpp" + "${hpx_SOURCE_DIR}/examples/accumulator/accumulators/stubs/managed_accumulator.hpp" + "${hpx_SOURCE_DIR}/examples/accumulator/accumulators/managed_accumulator.hpp" + "${hpx_SOURCE_DIR}/examples/accumulator/accumulators/managed_accumulator.cpp" + "${hpx_SOURCE_DIR}/examples/accumulator/managed_accumulator_client.cpp" + "${hpx_SOURCE_DIR}/examples/hello_world_component/hello_world_component.hpp" + "${hpx_SOURCE_DIR}/examples/hello_world_component/hello_world_component.cpp" + "${hpx_SOURCE_DIR}/examples/performance_counters/simplest_performance_counter.cpp" + "${hpx_SOURCE_DIR}/examples/performance_counters/sine/server/sine.hpp" + "${hpx_SOURCE_DIR}/hpx/performance_counters/performance_counter.hpp" + "${hpx_SOURCE_DIR}/hpx/performance_counters/base_performance_counter.hpp") set(all_documentation_dependencies ${documentation_files} @@ -35,23 +35,23 @@ set(all_documentation_dependencies # Add all files here which should be passed to doxygen set(doxygen_dependencies - ${hpx_SOURCE_DIR}/hpx/hpx_fwd.hpp - ${hpx_SOURCE_DIR}/hpx/hpx_init.hpp - ${hpx_SOURCE_DIR}/hpx/hpx_start.hpp - ${hpx_SOURCE_DIR}/hpx/hpx_finalize.hpp - ${hpx_SOURCE_DIR}/hpx/error.hpp - ${hpx_SOURCE_DIR}/hpx/exception.hpp - ${hpx_SOURCE_DIR}/hpx/runtime/get_ptr.hpp - ${hpx_SOURCE_DIR}/hpx/runtime/actions/action_support.hpp - ${hpx_SOURCE_DIR}/hpx/runtime/actions/plain_action.hpp - ${hpx_SOURCE_DIR}/hpx/runtime/actions/component_non_const_action.hpp - ${hpx_SOURCE_DIR}/hpx/runtime/components/new.hpp - ${hpx_SOURCE_DIR}/hpx/runtime/components/copy_component.hpp - ${hpx_SOURCE_DIR}/hpx/runtime/components/migrate_component.hpp - ${hpx_SOURCE_DIR}/hpx/runtime/naming/unmanaged.hpp - ${hpx_SOURCE_DIR}/hpx/lcos/fold.hpp - ${hpx_SOURCE_DIR}/hpx/lcos/reduce.hpp - ${hpx_SOURCE_DIR}/hpx/performance_counters/manage_counter_type.hpp) + "${hpx_SOURCE_DIR}/hpx/hpx_fwd.hpp" + "${hpx_SOURCE_DIR}/hpx/hpx_init.hpp" + "${hpx_SOURCE_DIR}/hpx/hpx_start.hpp" + "${hpx_SOURCE_DIR}/hpx/hpx_finalize.hpp" + "${hpx_SOURCE_DIR}/hpx/error.hpp" + "${hpx_SOURCE_DIR}/hpx/exception.hpp" + "${hpx_SOURCE_DIR}/hpx/runtime/get_ptr.hpp" + "${hpx_SOURCE_DIR}/hpx/runtime/actions/action_supp"ort.hpp" + "${hpx_SOURCE_DIR}/hpx/runtime/actions/plain_action.hpp" + "${hpx_SOURCE_DIR}/hpx/runtime/actions/component_non_const_action.hpp" + "${hpx_SOURCE_DIR}/hpx/runtime/components/new.hpp" + "${hpx_SOURCE_DIR}/hpx/runtime/components/copy_component.hpp" + "${hpx_SOURCE_DIR}/hpx/runtime/components/migrate_component.hpp" + "${hpx_SOURCE_DIR}/hpx/runtime/naming/unmanaged.hpp" + "${hpx_SOURCE_DIR}/hpx/lcos/fold.hpp" + "${hpx_SOURCE_DIR}/hpx/lcos/reduce.hpp" + "${hpx_SOURCE_DIR}/hpx/performance_counters/manage_counter_type.hpp") foreach(doxygen_input ${doxygen_dependencies}) @@ -87,8 +87,8 @@ foreach(doxygen_input ${doxygen_dependencies}) endforeach() hpx_info("doxygen" "Creating ${CMAKE_CURRENT_BINARY_DIR}/hpx_autodoc.doxy") -configure_file(${hpx_SOURCE_DIR}/cmake/templates/autodoc.doxy.in - ${CMAKE_CURRENT_BINARY_DIR}/hpx_autodoc.doxy +configure_file("${hpx_SOURCE_DIR}/cmake/templates/autodoc.doxy.in" + "${CMAKE_CURRENT_BINARY_DIR}/hpx_autodoc.doxy" @ONLY) ############################################################################# @@ -97,7 +97,7 @@ set(all_documentation_dependencies ${all_documentation_dependencies} # Generate Doxygen from the source code. hpx_source_to_boostbook(hpx_autodoc - CATALOG ${CMAKE_CURRENT_BINARY_DIR}/boostbook_catalog.xml + CATALOG "${CMAKE_CURRENT_BINARY_DIR}/boostbook_catalog.xml" DEPENDENCIES ${doxygen_dependencies}) set(quickbook_fixme_mode "-D__hpx_disable_fixme__") @@ -117,7 +117,7 @@ hpx_quickbook_to_html(hpx SOURCE hpx.qbk INDEX hpx.idx DEPENDENCIES ${all_documentation_dependencies} - CATALOG ${CMAKE_CURRENT_BINARY_DIR}/boostbook_catalog.xml + CATALOG "${CMAKE_CURRENT_BINARY_DIR}/boostbook_catalog.xml" XSLTPROC_ARGS --stringparam chunk.section.depth 4 --stringparam chunk.first.sections 1 --stringparam toc.section.depth 4 @@ -179,19 +179,21 @@ set_source_files_properties(${documentation_files} # handle generating docs for github pages if(MSVC) add_custom_target(git_docs - COMMAND ${CMAKE_COMMAND} + COMMAND "${CMAKE_COMMAND}" -DHPX_BUILD_TYPE="${CMAKE_BUILD_TYPE}" -DHPX_SOURCE_DIR="${CMAKE_SOURCE_DIR}" -DHPX_VERSION="${HPX_VERSION}" -DHPX_DOCUMENTATION_FILES=\"${documentation_dependencies}\" - -P ${CMAKE_SOURCE_DIR}/cmake/HPX_UpdateGitDocs.cmake) + -P "${CMAKE_SOURCE_DIR}/cmake/HPX_UpdateGitDocs.cmake" + VERBATIM) else() add_custom_target(git_docs - COMMAND ${CMAKE_COMMAND} + COMMAND "${CMAKE_COMMAND}" -DHPX_SOURCE_DIR="${CMAKE_SOURCE_DIR}" -DHPX_VERSION="${HPX_VERSION}" -DHPX_DOCUMENTATION_FILES=\"${documentation_dependencies}\" - -P ${CMAKE_SOURCE_DIR}/cmake/HPX_UpdateGitDocs.cmake) + -P "${CMAKE_SOURCE_DIR}/cmake/HPX_UpdateGitDocs.cmake" + VERBATIM) endif() add_dependencies(git_docs docs) diff --git a/examples/interpolate1d/CMakeLists.txt b/examples/interpolate1d/CMakeLists.txt index b1b89bcdbebb..86563d53b1fa 100644 --- a/examples/interpolate1d/CMakeLists.txt +++ b/examples/interpolate1d/CMakeLists.txt @@ -8,8 +8,7 @@ find_package(HPX_HDF5) if(HDF5_CPP_FOUND) if(HDF5_FOUND) - include_directories(${HDF5_INCLUDE_DIR}) - include_directories(${HDF5_CPP_INCLUDE_DIR}) + include_directories("${HDF5_INCLUDE_DIR}" "${HDF5_CPP_INCLUDE_DIR}") # just recurse into all components subdirectories and execute the scripts there set(subdirs diff --git a/examples/sheneos/CMakeLists.txt b/examples/sheneos/CMakeLists.txt index 9eaae0a55e68..652b76dfd2a1 100644 --- a/examples/sheneos/CMakeLists.txt +++ b/examples/sheneos/CMakeLists.txt @@ -8,8 +8,7 @@ find_package(HPX_HDF5) if(HDF5_CPP_FOUND) if(HDF5_THREAD_SAFE) - - include_directories(${HDF5_INCLUDE_DIR} ${HDF5_CPP_INCLUDE_DIR}) + include_directories("${HDF5_INCLUDE_DIR}" "${HDF5_CPP_INCLUDE_DIR}") # add a custom target for this example add_hpx_pseudo_target(examples.sheneos.sheneos) diff --git a/plugins/binary_filter/bzip2/CMakeLists.txt b/plugins/binary_filter/bzip2/CMakeLists.txt index ba13a3e0539a..2580164c57bf 100644 --- a/plugins/binary_filter/bzip2/CMakeLists.txt +++ b/plugins/binary_filter/bzip2/CMakeLists.txt @@ -21,14 +21,14 @@ endif() macro(add_bzip2_module) hpx_debug("add_bzip2_module" "BZIP2_FOUND: ${BZIP2_FOUND}") if(HPX_HAVE_COMPRESSION_BZIP2 AND BZIP2_FOUND) - hpx_include_sys_directories(${BZIP2_INCLUDE_DIR}) - hpx_link_sys_directories(${BZIP2_LIBRARY_DIR}) + hpx_include_sys_directories("${BZIP2_INCLUDE_DIR}") + hpx_link_sys_directories("${BZIP2_LIBRARY_DIR}") add_hpx_library(compress_bzip2 - SOURCES ${hpx_SOURCE_DIR}/plugins/binary_filter/bzip2/bzip2_serialization_filter.cpp - HEADERS ${hpx_SOURCE_DIR}/hpx/plugins/binary_filter/bzip2_serialization_filter.hpp + SOURCES "${hpx_SOURCE_DIR}/plugins/binary_filter/bzip2/bzip2_serialization_filter.cpp" + HEADERS "${hpx_SOURCE_DIR}/hpx/plugins/binary_filter/bzip2_serialization_filter.hpp" FOLDER "Core/Plugins/Compression" - DEPENDENCIES ${BZIP2_LIBRARY}) + DEPENDENCIES "${BZIP2_LIBRARY}") set_property(TARGET compress_bzip2_lib APPEND PROPERTY COMPILE_DEFINITIONS diff --git a/plugins/binary_filter/snappy/CMakeLists.txt b/plugins/binary_filter/snappy/CMakeLists.txt index dbe58016e1fa..6a7bbacb1a5f 100644 --- a/plugins/binary_filter/snappy/CMakeLists.txt +++ b/plugins/binary_filter/snappy/CMakeLists.txt @@ -13,14 +13,14 @@ endif() macro(add_snappy_module) hpx_debug("add_snappy_module" "SNAPPY_FOUND: ${SNAPPY_FOUND}") if(HPX_HAVE_COMPRESSION_SNAPPY AND SNAPPY_FOUND) - hpx_include_sys_directories(${SNAPPY_INCLUDE_DIR}) - hpx_link_sys_directories(${SNAPPY_LIBRARY_DIR}) + hpx_include_sys_directories("${SNAPPY_INCLUDE_DIR}") + hpx_link_sys_directories("${SNAPPY_LIBRARY_DIR}") add_hpx_library(compress_snappy - SOURCES ${hpx_SOURCE_DIR}/plugins/binary_filter/snappy/snappy_serialization_filter.cpp - HEADERS ${hpx_SOURCE_DIR}/hpx/plugins/binary_filter/snappy_serialization_filter.hpp + SOURCES "${hpx_SOURCE_DIR}/plugins/binary_filter/snappy/snappy_serialization_filter.cpp" + HEADERS "${hpx_SOURCE_DIR}/hpx/plugins/binary_filter/snappy_serialization_filter.hpp" FOLDER "Core/Plugins/Compression" - DEPENDENCIES ${SNAPPY_LIBRARY}) + DEPENDENCIES "${SNAPPY_LIBRARY}") set_property(TARGET compress_snappy_lib APPEND PROPERTY COMPILE_DEFINITIONS diff --git a/plugins/binary_filter/zlib/CMakeLists.txt b/plugins/binary_filter/zlib/CMakeLists.txt index 51ae97af24f6..4a188ca41a54 100644 --- a/plugins/binary_filter/zlib/CMakeLists.txt +++ b/plugins/binary_filter/zlib/CMakeLists.txt @@ -21,14 +21,14 @@ endif() macro(add_zlib_module) hpx_debug("add_zlib_module" "ZLIB_FOUND: ${ZLIB_FOUND}") if(HPX_HAVE_COMPRESSION_ZLIB AND ZLIB_FOUND) - hpx_include_sys_directories(${ZLIB_INCLUDE_DIR}) - hpx_link_sys_directories(${ZLIB_LIBRARY_DIR}) + hpx_include_sys_directories("${ZLIB_INCLUDE_DIR}") + hpx_link_sys_directories("${ZLIB_LIBRARY_DIR}") add_hpx_library(compress_zlib - SOURCES ${hpx_SOURCE_DIR}/plugins/binary_filter/zlib/zlib_serialization_filter.cpp - HEADERS ${hpx_SOURCE_DIR}/hpx/plugins/binary_filter/zlib_serialization_filter.hpp + SOURCES "${hpx_SOURCE_DIR}/plugins/binary_filter/zlib/zlib_serialization_filter.cpp" + HEADERS "${hpx_SOURCE_DIR}/hpx/plugins/binary_filter/zlib_serialization_filter.hpp" FOLDER "Core/Plugins/Compression" - DEPENDENCIES ${ZLIB_LIBRARY}) + DEPENDENCIES "${ZLIB_LIBRARY}") set_property(TARGET compress_zlib_lib APPEND PROPERTY COMPILE_DEFINITIONS diff --git a/plugins/parcel/coalescing/CMakeLists.txt b/plugins/parcel/coalescing/CMakeLists.txt index 33890632bac0..093e4279e03c 100644 --- a/plugins/parcel/coalescing/CMakeLists.txt +++ b/plugins/parcel/coalescing/CMakeLists.txt @@ -8,10 +8,10 @@ include(HPX_AddLibrary) macro(add_coalescing_module) hpx_debug("add_coalescing_module") add_hpx_library(parcel_coalescing - SOURCES ${hpx_SOURCE_DIR}/plugins/parcel/coalescing/coalescing_message_handler.cpp + SOURCES "${hpx_SOURCE_DIR}/plugins/parcel/coalescing/coalescing_message_handler.cpp" HEADERS - ${hpx_SOURCE_DIR}/hpx/plugins/parcel/coalescing_message_handler.hpp - ${hpx_SOURCE_DIR}/hpx/plugins/parcel/message_buffer.hpp + "${hpx_SOURCE_DIR}/hpx/plugins/parcel/coalescing_message_handler.hpp" + "${hpx_SOURCE_DIR}/hpx/plugins/parcel/message_buffer.hpp" FOLDER "Core/Plugins/MessageHandler") set_property(TARGET parcel_coalescing_lib APPEND diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index f1a725338d86..f5e7e32ebfb3 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -112,10 +112,11 @@ if(MSVC) add_hpx_library_sources(hpx_external_objects GLOB GLOBS "${switch_to_fiber_source}") add_custom_command( - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/switch_to_fiber.obj - COMMAND ${CMAKE_ASM_MASM_COMPILER} /Fo ${CMAKE_CURRENT_BINARY_DIR}/switch_to_fiber.obj /nologo /c ${switch_to_fiber_source} - DEPENDS ${switch_to_fiber_source}) - set(hpx_external_OBJECTS ${CMAKE_CURRENT_BINARY_DIR}/switch_to_fiber.obj + OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/switch_to_fiber.obj" + COMMAND "${CMAKE_ASM_MASM_COMPILER}" /Fo "${CMAKE_CURRENT_BINARY_DIR}/switch_to_fiber.obj" /nologo /c "${switch_to_fiber_source}" + DEPENDS "${switch_to_fiber_source}" + VERBATIM) + set(hpx_external_OBJECTS "${CMAKE_CURRENT_BINARY_DIR}/switch_to_fiber.obj" CACHE INTERNAL "External object files for HPX." FORCE) hpx_add_config_define(HPX_HAVE_SWAP_CONTEXT_EMULATION 1) endif() @@ -188,41 +189,41 @@ add_hpx_library_headers(hpx_init add_hpx_source_group( NAME hpx_serialization CLASS "Source Files" - ROOT ${hpx_SOURCE_DIR}/src/util + ROOT "${hpx_SOURCE_DIR}/src/util" TARGETS ${hpx_serialization_SOURCES}) add_hpx_source_group( NAME hpx_serialization CLASS "Header Files" - ROOT ${hpx_SOURCE_DIR}/hpx/util + ROOT "${hpx_SOURCE_DIR}/hpx/util" TARGETS ${hpx_serialization_HEADERS}) add_hpx_source_group( NAME hpx CLASS "Source Files" - ROOT ${hpx_SOURCE_DIR}/src + ROOT "${hpx_SOURCE_DIR}/src" TARGETS ${hpx_SOURCES}) add_hpx_source_group( NAME hpx CLASS "External Source Files" - ROOT ${hpx_SOURCE_DIR}/external + ROOT "${hpx_SOURCE_DIR}/external" TARGETS ${hpx_external_SOURCES}) add_hpx_source_group( NAME hpx CLASS "Header Files" - ROOT ${hpx_SOURCE_DIR}/hpx + ROOT "${hpx_SOURCE_DIR}/hpx" TARGETS ${hpx_HEADERS}) add_hpx_source_group( NAME hpx_init CLASS "Source Files" - ROOT ${hpx_SOURCE_DIR}/src + ROOT "${hpx_SOURCE_DIR}/src" TARGETS ${hpx_init_SOURCES}) add_hpx_source_group( NAME hpx_init CLASS "Header Files" - ROOT ${hpx_SOURCE_DIR}/hpx + ROOT "${hpx_SOURCE_DIR}/hpx" TARGETS ${hpx_init_HEADERS}) ################################################################################ @@ -271,22 +272,22 @@ endif() if(MSVC) set_target_properties(hpx_serialization PROPERTIES - RUNTIME_OUTPUT_DIRECTORY_RELEASE ${HPX_LIBRARY_OUTPUT_DIRECTORY_RELEASE} - RUNTIME_OUTPUT_DIRECTORY_DEBUG ${HPX_LIBRARY_OUTPUT_DIRECTORY_DEBUG} - RUNTIME_OUTPUT_DIRECTORY_MINSIZEREL ${HPX_LIBRARY_OUTPUT_DIRECTORY_MINSIZEREL} - RUNTIME_OUTPUT_DIRECTORY_RELWITHDEBINFO ${HPX_LIBRARY_OUTPUT_DIRECTORY_RELWITHDEBINFO} - ARCHIVE_OUTPUT_DIRECTORY_RELEASE ${HPX_ARCHIVE_OUTPUT_DIRECTORY_RELEASE} - ARCHIVE_OUTPUT_DIRECTORY_DEBUG ${HPX_ARCHIVE_OUTPUT_DIRECTORY_DEBUG} - ARCHIVE_OUTPUT_DIRECTORY_MINSIZEREL ${HPX_ARCHIVE_OUTPUT_DIRECTORY_MINSIZEREL} - ARCHIVE_OUTPUT_DIRECTORY_RELWITHDEBINFO ${HPX_ARCHIVE_OUTPUT_DIRECTORY_RELWITHDEBINFO} - LIBRARY_OUTPUT_DIRECTORY_RELEASE ${HPX_LIBRARY_OUTPUT_DIRECTORY_RELEASE} - LIBRARY_OUTPUT_DIRECTORY_DEBUG ${HPX_LIBRARY_OUTPUT_DIRECTORY_DEBUG} - LIBRARY_OUTPUT_DIRECTORY_MINSIZEREL ${HPX_LIBRARY_OUTPUT_DIRECTORY_MINSIZEREL} - LIBRARY_OUTPUT_DIRECTORY_RELWITHDEBINFO ${HPX_LIBRARY_OUTPUT_DIRECTORY_RELWITHDEBINFO}) + RUNTIME_OUTPUT_DIRECTORY_RELEASE "${HPX_LIBRARY_OUTPUT_DIRECTORY_RELEASE}" + RUNTIME_OUTPUT_DIRECTORY_DEBUG "${HPX_LIBRARY_OUTPUT_DIRECTORY_DEBUG}" + RUNTIME_OUTPUT_DIRECTORY_MINSIZEREL "${HPX_LIBRARY_OUTPUT_DIRECTORY_MINSIZEREL}" + RUNTIME_OUTPUT_DIRECTORY_RELWITHDEBINFO "${HPX_LIBRARY_OUTPUT_DIRECTORY_RELWITHDEBINFO}" + ARCHIVE_OUTPUT_DIRECTORY_RELEASE "${HPX_ARCHIVE_OUTPUT_DIRECTORY_RELEASE}" + ARCHIVE_OUTPUT_DIRECTORY_DEBUG "${HPX_ARCHIVE_OUTPUT_DIRECTORY_DEBUG}" + ARCHIVE_OUTPUT_DIRECTORY_MINSIZEREL "${HPX_ARCHIVE_OUTPUT_DIRECTORY_MINSIZEREL}" + ARCHIVE_OUTPUT_DIRECTORY_RELWITHDEBINFO "${HPX_ARCHIVE_OUTPUT_DIRECTORY_RELWITHDEBINFO}" + LIBRARY_OUTPUT_DIRECTORY_RELEASE "${HPX_LIBRARY_OUTPUT_DIRECTORY_RELEASE}" + LIBRARY_OUTPUT_DIRECTORY_DEBUG "${HPX_LIBRARY_OUTPUT_DIRECTORY_DEBUG}" + LIBRARY_OUTPUT_DIRECTORY_MINSIZEREL "${HPX_LIBRARY_OUTPUT_DIRECTORY_MINSIZEREL}" + LIBRARY_OUTPUT_DIRECTORY_RELWITHDEBINFO "${HPX_LIBRARY_OUTPUT_DIRECTORY_RELWITHDEBINFO}") else() set_target_properties(hpx_serialization PROPERTIES - RUNTIME_OUTPUT_DIRECTORY ${HPX_RUNTIME_OUTPUT_DIRECTORY} - LIBRARY_OUTPUT_DIRECTORY ${HPX_LIBRARY_OUTPUT_DIRECTORY}) + RUNTIME_OUTPUT_DIRECTORY "${HPX_RUNTIME_OUTPUT_DIRECTORY}" + LIBRARY_OUTPUT_DIRECTORY "${HPX_LIBRARY_OUTPUT_DIRECTORY}") endif() set(hpx_serialization_lib_dependencies @@ -342,18 +343,18 @@ endif() set(hpx_link_flag_properties) if(MSVC) set_target_properties(hpx PROPERTIES - RUNTIME_OUTPUT_DIRECTORY_RELEASE ${HPX_LIBRARY_OUTPUT_DIRECTORY_RELEASE} - RUNTIME_OUTPUT_DIRECTORY_DEBUG ${HPX_LIBRARY_OUTPUT_DIRECTORY_DEBUG} - RUNTIME_OUTPUT_DIRECTORY_MINSIZEREL ${HPX_LIBRARY_OUTPUT_DIRECTORY_MINSIZEREL} - RUNTIME_OUTPUT_DIRECTORY_RELWITHDEBINFO ${HPX_LIBRARY_OUTPUT_DIRECTORY_RELWITHDEBINFO} - ARCHIVE_OUTPUT_DIRECTORY_RELEASE ${HPX_ARCHIVE_OUTPUT_DIRECTORY_RELEASE} - ARCHIVE_OUTPUT_DIRECTORY_DEBUG ${HPX_ARCHIVE_OUTPUT_DIRECTORY_DEBUG} - ARCHIVE_OUTPUT_DIRECTORY_MINSIZEREL ${HPX_ARCHIVE_OUTPUT_DIRECTORY_MINSIZEREL} - ARCHIVE_OUTPUT_DIRECTORY_RELWITHDEBINFO ${HPX_ARCHIVE_OUTPUT_DIRECTORY_RELWITHDEBINFO} - LIBRARY_OUTPUT_DIRECTORY_RELEASE ${HPX_LIBRARY_OUTPUT_DIRECTORY_RELEASE} - LIBRARY_OUTPUT_DIRECTORY_DEBUG ${HPX_LIBRARY_OUTPUT_DIRECTORY_DEBUG} - LIBRARY_OUTPUT_DIRECTORY_MINSIZEREL ${HPX_LIBRARY_OUTPUT_DIRECTORY_MINSIZEREL} - LIBRARY_OUTPUT_DIRECTORY_RELWITHDEBINFO ${HPX_LIBRARY_OUTPUT_DIRECTORY_RELWITHDEBINFO}) + RUNTIME_OUTPUT_DIRECTORY_RELEASE "${HPX_LIBRARY_OUTPUT_DIRECTORY_RELEASE}" + RUNTIME_OUTPUT_DIRECTORY_DEBUG "${HPX_LIBRARY_OUTPUT_DIRECTORY_DEBUG}" + RUNTIME_OUTPUT_DIRECTORY_MINSIZEREL "${HPX_LIBRARY_OUTPUT_DIRECTORY_MINSIZEREL}" + RUNTIME_OUTPUT_DIRECTORY_RELWITHDEBINFO "${HPX_LIBRARY_OUTPUT_DIRECTORY_RELWITHDEBINFO}" + ARCHIVE_OUTPUT_DIRECTORY_RELEASE "${HPX_ARCHIVE_OUTPUT_DIRECTORY_RELEASE}" + ARCHIVE_OUTPUT_DIRECTORY_DEBUG "${HPX_ARCHIVE_OUTPUT_DIRECTORY_DEBUG}" + ARCHIVE_OUTPUT_DIRECTORY_MINSIZEREL "${HPX_ARCHIVE_OUTPUT_DIRECTORY_MINSIZEREL}" + ARCHIVE_OUTPUT_DIRECTORY_RELWITHDEBINFO "${HPX_ARCHIVE_OUTPUT_DIRECTORY_RELWITHDEBINFO}" + LIBRARY_OUTPUT_DIRECTORY_RELEASE "${HPX_LIBRARY_OUTPUT_DIRECTORY_RELEASE}" + LIBRARY_OUTPUT_DIRECTORY_DEBUG "${HPX_LIBRARY_OUTPUT_DIRECTORY_DEBUG}" + LIBRARY_OUTPUT_DIRECTORY_MINSIZEREL "${HPX_LIBRARY_OUTPUT_DIRECTORY_MINSIZEREL}" + LIBRARY_OUTPUT_DIRECTORY_RELWITHDEBINFO "${HPX_LIBRARY_OUTPUT_DIRECTORY_RELWITHDEBINFO}") if(TCMALLOC_FOUND AND "${HPX_MALLOC}" MATCHES "tcmalloc|TCMalloc|TCMALLOC") set(hpx_link_flag_properties "${hpx_link_flag_properties} /include:__tcmalloc") @@ -361,8 +362,8 @@ if(MSVC) endif() else() set_target_properties(hpx PROPERTIES - RUNTIME_OUTPUT_DIRECTORY ${HPX_RUNTIME_OUTPUT_DIRECTORY} - LIBRARY_OUTPUT_DIRECTORY ${HPX_LIBRARY_OUTPUT_DIRECTORY}) + RUNTIME_OUTPUT_DIRECTORY "${HPX_RUNTIME_OUTPUT_DIRECTORY}" + LIBRARY_OUTPUT_DIRECTORY "${HPX_LIBRARY_OUTPUT_DIRECTORY}") endif() if(HPX_HAVE_PARCELPORT_MPI AND MPI_FOUND) @@ -374,7 +375,7 @@ if(NOT MSVC) PROPERTIES SKIP_BUILD_RPATH TRUE BUILD_WITH_INSTALL_RPATH TRUE INSTALL_RPATH_USE_LINK_PATH TRUE - INSTALL_RPATH ${HPX_RPATH}) + INSTALL_RPATH "${HPX_RPATH}") else() if(HPX_HAVE_SWAP_CONTEXT_EMULATION) set(hpx_link_flag_properties "${hpx_link_flag_properties} /EXPORT:switch_to_fiber") @@ -424,13 +425,13 @@ set_property(TARGET hpx_init APPEND if(MSVC) set_target_properties(hpx_init PROPERTIES - ARCHIVE_OUTPUT_DIRECTORY_RELEASE ${HPX_ARCHIVE_OUTPUT_DIRECTORY_RELEASE} - ARCHIVE_OUTPUT_DIRECTORY_DEBUG ${HPX_ARCHIVE_OUTPUT_DIRECTORY_DEBUG} - ARCHIVE_OUTPUT_DIRECTORY_MINSIZEREL ${HPX_ARCHIVE_OUTPUT_DIRECTORY_MINSIZEREL} - ARCHIVE_OUTPUT_DIRECTORY_RELWITHDEBINFO ${HPX_ARCHIVE_OUTPUT_DIRECTORY_RELWITHDEBINFO}) + ARCHIVE_OUTPUT_DIRECTORY_RELEASE "${HPX_ARCHIVE_OUTPUT_DIRECTORY_RELEASE}" + ARCHIVE_OUTPUT_DIRECTORY_DEBUG "${HPX_ARCHIVE_OUTPUT_DIRECTORY_DEBUG}" + ARCHIVE_OUTPUT_DIRECTORY_MINSIZEREL "${HPX_ARCHIVE_OUTPUT_DIRECTORY_MINSIZEREL}" + ARCHIVE_OUTPUT_DIRECTORY_RELWITHDEBINFO "${HPX_ARCHIVE_OUTPUT_DIRECTORY_RELWITHDEBINFO}") else() set_target_properties(hpx_init PROPERTIES - ARCHIVE_OUTPUT_DIRECTORY ${HPX_ARCHIVE_OUTPUT_DIRECTORY}) + ARCHIVE_OUTPUT_DIRECTORY "${HPX_ARCHIVE_OUTPUT_DIRECTORY}") endif() set_property(TARGET hpx_init PROPERTY FOLDER "Core") diff --git a/tests/performance/local/CMakeLists.txt b/tests/performance/local/CMakeLists.txt index 394ea0f99402..81a9c7ba8b02 100644 --- a/tests/performance/local/CMakeLists.txt +++ b/tests/performance/local/CMakeLists.txt @@ -14,7 +14,9 @@ find_package(HPX_OpenMP) if(MSVC) set(boost_library_dependencies) else() - set(boost_library_dependencies ${BOOST_PROGRAM_OPTIONS_LIBRARY} ${BOOST_SYSTEM_LIBRARY} ${BOOST_CHRONO_LIBRARY}) + set(boost_library_dependencies "${BOOST_PROGRAM_OPTIONS_LIBRARY}" + "${BOOST_SYSTEM_LIBRARY}" + "${BOOST_CHRONO_LIBRARY}") endif() set(benchmarks @@ -38,7 +40,7 @@ if(OPENMP_FOUND) endif() if(QTHREADS_FOUND) - include_directories(${QTHREADS_INCLUDE_DIR}) + include_directories("${QTHREADS_INCLUDE_DIR}") set(benchmarks ${benchmarks} @@ -48,15 +50,15 @@ if(QTHREADS_FOUND) set(qthreads_homogeneous_timed_task_spawn_FLAGS NOLIBS DEPENDENCIES ${boost_library_dependencies} - ${QTHREADS_LIBRARY}) + "${QTHREADS_LIBRARY}") set(qthreads_heterogeneous_timed_task_spawn_FLAGS NOLIBS DEPENDENCIES ${boost_library_dependencies} - ${QTHREADS_LIBRARY}) + "${QTHREADS_LIBRARY}") endif() if(TBB_FOUND) - include_directories(${TBB_INCLUDE_DIR}) + include_directories("${TBB_INCLUDE_DIR}") set(benchmarks ${benchmarks} @@ -65,11 +67,11 @@ if(TBB_FOUND) set(tbb_homogeneous_timed_task_spawn_FLAGS NOLIBS DEPENDENCIES ${boost_library_dependencies} - ${TBB_LIBRARY}) + "${TBB_LIBRARY}") endif() if(SWARM_FOUND) - include_directories(${SWARM_INCLUDE_DIR}) + include_directories("${SWARM_INCLUDE_DIR}") set(benchmarks ${benchmarks} @@ -78,7 +80,7 @@ if(SWARM_FOUND) set(swarm_homogeneous_timed_task_spawn_FLAGS NOLIBS DEPENDENCIES ${boost_library_dependencies} - ${SWARM_LIBRARY}) + "${SWARM_LIBRARY}") endif() set(hpx_homogeneous_timed_task_spawn_executors_FLAGS DEPENDENCIES iostreams_component) @@ -88,7 +90,7 @@ set(delay_baseline_FLAGS NOLIBS DEPENDENCIES ${boost_library_dependencies}) set(delay_baseline_threaded_FLAGS NOLIBS - DEPENDENCIES ${boost_library_dependencies} ${BOOST_THREAD_LIBRARY}) + DEPENDENCIES ${boost_library_dependencies} "${BOOST_THREAD_LIBRARY}") set(print_heterogeneous_payloads_FLAGS NOLIBS DEPENDENCIES ${boost_library_dependencies}) diff --git a/tests/performance/network/network_storage/CMakeLists.txt b/tests/performance/network/network_storage/CMakeLists.txt index c76f586dd9d7..6d3918aa251b 100644 --- a/tests/performance/network/network_storage/CMakeLists.txt +++ b/tests/performance/network/network_storage/CMakeLists.txt @@ -16,7 +16,7 @@ add_hpx_pseudo_dependencies( hpx_option(HPX_BENCHMARK_SCRIPTS_PATH PATH "Directory to place batch scripts in" - ${hpx_BINARY_DIR}/scripts + "${hpx_BINARY_DIR}/scripts" ADVANCED) # our windows batch script needs to know the lib path for boost/hpx @@ -26,8 +26,8 @@ if (WIN32) file(TO_NATIVE_PATH "${BOOST_LIBRARY_DIR};${HPX_PREFIX}/lib/hpx" LIB_PATH) # generate a simple batch file for convenience - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/network_storage.bat.in - ${HPX_BENCHMARK_SCRIPTS_PATH}/network_storage.bat + configure_file("${CMAKE_CURRENT_SOURCE_DIR}/network_storage.bat.in" + "${HPX_BENCHMARK_SCRIPTS_PATH}/network_storage.bat" @ONLY) else() #------------------------------------------------------- @@ -49,7 +49,7 @@ else() #set(LD_LIBRARY_PATH "${HPX_LIBRARY_OUTPUT_DIRECTORY_${CMAKE_CFG_INTDIR}}" CACHE PATH "Path to set when generating script tests") # Make sure scripts dir exists - execute_process(COMMAND ${CMAKE_COMMAND} -E make_directory ${HPX_BENCHMARK_SCRIPTS_PATH}) + execute_process(COMMAND "${CMAKE_COMMAND}" -E make_directory "${HPX_BENCHMARK_SCRIPTS_PATH}") #-------------------------------------------------- # Slurm script generator for @@ -57,8 +57,8 @@ else() #-------------------------------------------------- set(SCRIPT_NAME "slurm-test-HPX-storage") ADD_CUSTOM_COMMAND( - DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${SCRIPT_NAME}.sh.in - COMMAND ${CMAKE_COMMAND} + DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/${SCRIPT_NAME}.sh.in" + COMMAND "${CMAKE_COMMAND}" ARGS -DEXE_PATH="$" -DMPIEXEC="${MPIEXEC}" -DSCRIPT_SOURCE_DIR="${CMAKE_CURRENT_SOURCE_DIR}" @@ -66,12 +66,13 @@ else() -DSCRIPT_DEST_DIR="${HPX_BENCHMARK_SCRIPTS_PATH}" -DLIB_PATH="${LD_LIBRARY_PATH}" -DJOB_OPTIONS1="${SLURM_JOB_OPTIONS1}" - -P ${CMAKE_CURRENT_SOURCE_DIR}/copy_script.cmake - OUTPUT ${TESTING_SCRIPTS_PATH}/${SCRIPT_NAME}.sh + -P "${CMAKE_CURRENT_SOURCE_DIR}/copy_script.cmake" + OUTPUT "${TESTING_SCRIPTS_PATH}/${SCRIPT_NAME}.sh" + VERBATIM ) add_custom_target(script-network-storage ALL - DEPENDS ${TESTING_SCRIPTS_PATH}/slurm-test-HPX-storage.sh + DEPENDS "${TESTING_SCRIPTS_PATH}/slurm-test-HPX-storage.sh" ) endif()