Commit 0a440521 authored by Marian Triebe's avatar Marian Triebe

Complete quoting for CMake parameters, relates #182.

parent a0f6b4af
...@@ -53,7 +53,7 @@ if("${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_BINARY_DIR}") ...@@ -53,7 +53,7 @@ if("${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_BINARY_DIR}")
"initialize the build configuration.") "initialize the build configuration.")
endif() endif()
# set module path appropriately # set module path appropriately
set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}) set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}")
# set binary output path if not defined by user # set binary output path if not defined by user
if("${EXECUTABLE_OUTPUT_PATH}" STREQUAL "") if("${EXECUTABLE_OUTPUT_PATH}" STREQUAL "")
set(EXECUTABLE_OUTPUT_PATH "${CMAKE_BINARY_DIR}/bin") set(EXECUTABLE_OUTPUT_PATH "${CMAKE_BINARY_DIR}/bin")
...@@ -75,8 +75,8 @@ endif() ...@@ -75,8 +75,8 @@ endif()
if(NOT NO_COMPILER_CHECK) if(NOT NO_COMPILER_CHECK)
try_run(ProgramResult try_run(ProgramResult
CompilationSucceeded CompilationSucceeded
${CMAKE_BINARY_DIR} "${CMAKE_BINARY_DIR}"
${CMAKE_CURRENT_SOURCE_DIR}/cmake/get_compiler_version.cpp "${CMAKE_CURRENT_SOURCE_DIR}/cmake/get_compiler_version.cpp"
RUN_OUTPUT_VARIABLE CompilerVersion) RUN_OUTPUT_VARIABLE CompilerVersion)
if(NOT CompilationSucceeded OR NOT ProgramResult EQUAL 0) if(NOT CompilationSucceeded OR NOT ProgramResult EQUAL 0)
message(FATAL_ERROR "Cannot determine compiler version") message(FATAL_ERROR "Cannot determine compiler version")
...@@ -156,7 +156,7 @@ set(LD_FLAGS ${CMAKE_LD_LIBS}) ...@@ -156,7 +156,7 @@ set(LD_FLAGS ${CMAKE_LD_LIBS})
################################################################################ ################################################################################
if(CAF_LOG_LEVEL) if(CAF_LOG_LEVEL)
add_definitions(-DCAF_LOG_LEVEL=${CAF_LOG_LEVEL}) add_definitions(-DCAF_LOG_LEVEL="${CAF_LOG_LEVEL}")
endif() endif()
if(CAF_ENABLE_RUNTIME_CHECKS) if(CAF_ENABLE_RUNTIME_CHECKS)
...@@ -182,7 +182,7 @@ install(DIRECTORY libcaf_core/cppa/ ...@@ -182,7 +182,7 @@ install(DIRECTORY libcaf_core/cppa/
install(DIRECTORY libcaf_io/caf/ DESTINATION include/caf install(DIRECTORY libcaf_io/caf/ DESTINATION include/caf
FILES_MATCHING PATTERN "*.hpp") FILES_MATCHING PATTERN "*.hpp")
# install includes from opencl # install includes from opencl
if(EXISTS ${CMAKE_SOURCE_DIR}/libcaf_opencl/caf) if(EXISTS "${CMAKE_SOURCE_DIR}/libcaf_opencl/caf")
install(DIRECTORY libcaf_opencl/caf/ DESTINATION include/caf install(DIRECTORY libcaf_opencl/caf/ DESTINATION include/caf
FILES_MATCHING PATTERN "*.hpp") FILES_MATCHING PATTERN "*.hpp")
endif() endif()
...@@ -193,8 +193,8 @@ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/cmake/cmake_uninstall.cmake.in" ...@@ -193,8 +193,8 @@ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/cmake/cmake_uninstall.cmake.in"
IMMEDIATE @ONLY) IMMEDIATE @ONLY)
# add uninstall target # add uninstall target
add_custom_target(uninstall add_custom_target(uninstall
COMMAND ${CMAKE_COMMAND} -P COMMAND "${CMAKE_COMMAND} -P"
${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake) "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake")
################################################################################ ################################################################################
...@@ -203,15 +203,15 @@ add_custom_target(uninstall ...@@ -203,15 +203,15 @@ add_custom_target(uninstall
# path to caf core & io headers # path to caf core & io headers
set(LIBCAF_INCLUDE_DIRS set(LIBCAF_INCLUDE_DIRS
${CMAKE_SOURCE_DIR}/libcaf_core "${CMAKE_SOURCE_DIR}/libcaf_core"
${CMAKE_SOURCE_DIR}/libcaf_io) "${CMAKE_SOURCE_DIR}/libcaf_io")
# path to caf opencl headers # path to caf opencl headers
if(EXISTS ${CMAKE_SOURCE_DIR}/libcaf_opencl/caf) if(EXISTS "${CMAKE_SOURCE_DIR}/libcaf_opencl/caf")
set(LIBCAF_INCLUDE_DIRS set(LIBCAF_INCLUDE_DIRS
${CMAKE_SOURCE_DIR}/libcaf_opencl/ ${LIBCAF_INCLUDE_DIRS}) "${CMAKE_SOURCE_DIR}/libcaf_opencl/" "${LIBCAF_INCLUDE_DIRS}")
endif() endif()
# all projects need the headers of the core components # all projects need the headers of the core components
include_directories(${LIBCAF_INCLUDE_DIRS}) include_directories("${LIBCAF_INCLUDE_DIRS}")
################################################################################ ################################################################################
...@@ -242,7 +242,9 @@ if(NOT CAF_BUILD_STATIC_ONLY) ...@@ -242,7 +242,9 @@ if(NOT CAF_BUILD_STATIC_ONLY)
add_dependencies(libcaf_io libcaf_core) add_dependencies(libcaf_io libcaf_core)
endif() endif()
# set LIBCAF_LIBRARIES for other subprojects # set LIBCAF_LIBRARIES for other subprojects
set(LIBCAF_LIBRARIES ${LIBCAF_CORE_LIBRARY} ${LIBCAF_IO_LIBRARY} ${LIBCAF_OPENCL_LIBRARY}) set(LIBCAF_LIBRARIES "${LIBCAF_CORE_LIBRARY}"
"${LIBCAF_IO_LIBRARY}"
"${LIBCAF_OPENCL_LIBRARY}")
# add unit tests if not being told otherwise # add unit tests if not being told otherwise
if(NOT CAF_NO_UNIT_TESTS) if(NOT CAF_NO_UNIT_TESTS)
enable_testing() enable_testing()
...@@ -271,13 +273,13 @@ if(NOT CAF_NO_RIAC AND EXISTS "${CMAKE_SOURCE_DIR}/libcaf_riac/caf/") ...@@ -271,13 +273,13 @@ if(NOT CAF_NO_RIAC AND EXISTS "${CMAKE_SOURCE_DIR}/libcaf_riac/caf/")
add_dependencies(libcaf_riacStatic libcaf_ioStatic) add_dependencies(libcaf_riacStatic libcaf_ioStatic)
endif() endif()
if(CAF_BUILD_STATIC_ONLY) if(CAF_BUILD_STATIC_ONLY)
set(LIBCAF_LIBRARIES ${LIBCAF_LIBRARIES} libcaf_riacStatic) set(LIBCAF_LIBRARIES "${LIBCAF_LIBRARIES}" libcaf_riacStatic)
else() else()
add_dependencies(libcaf_riac libcaf_io) add_dependencies(libcaf_riac libcaf_io)
set(LIBCAF_LIBRARIES ${LIBCAF_LIBRARIES} libcaf_riac) set(LIBCAF_LIBRARIES "${LIBCAF_LIBRARIES}" libcaf_riac)
endif() endif()
# add headers to include directories so other subprojects can use RIAC # add headers to include directories so other subprojects can use RIAC
include_directories(${LIBCAF_INCLUDE_DIRS} "${CMAKE_SOURCE_DIR}/libcaf_riac") include_directories("${LIBCAF_INCLUDE_DIRS}" "${CMAKE_SOURCE_DIR}/libcaf_riac")
# add libcaf_riac to the list of caf libraries # add libcaf_riac to the list of caf libraries
set(CAF_HAS_RIAC yes) set(CAF_HAS_RIAC yes)
set(CAF_NO_RIAC no) set(CAF_NO_RIAC no)
...@@ -337,10 +339,12 @@ endif() ...@@ -337,10 +339,12 @@ endif()
# check for doxygen and add custom "doc" target to Makefile # check for doxygen and add custom "doc" target to Makefile
find_package(Doxygen) find_package(Doxygen)
if(DOXYGEN_FOUND) if(DOXYGEN_FOUND)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile.in ${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile configure_file("${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile.in"
"${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile"
@ONLY) @ONLY)
add_custom_target(doc ${DOXYGEN_EXECUTABLE} ${CMAKE_HOME_DIRECTORY}/Doxyfile add_custom_target(doc "${DOXYGEN_EXECUTABLE}"
WORKING_DIRECTORY ${CMAKE_HOME_DIRECTORY} "${CMAKE_HOME_DIRECTORY}/Doxyfile"
WORKING_DIRECTORY "${CMAKE_HOME_DIRECTORY}"
COMMENT "Generating API documentation with Doxygen" COMMENT "Generating API documentation with Doxygen"
VERBATIM) VERBATIM)
endif(DOXYGEN_FOUND) endif(DOXYGEN_FOUND)
...@@ -385,7 +389,7 @@ invertYesNo(CAF_NO_MEM_MANAGEMENT CAF_BUILD_MEM_MANAGEMENT) ...@@ -385,7 +389,7 @@ invertYesNo(CAF_NO_MEM_MANAGEMENT CAF_BUILD_MEM_MANAGEMENT)
invertYesNo(CAF_NO_BENCHMARKS CAF_BUILD_BENCHMARKS) invertYesNo(CAF_NO_BENCHMARKS CAF_BUILD_BENCHMARKS)
invertYesNo(CAF_NO_OPENCL CAF_BUILD_OPENCL) invertYesNo(CAF_NO_OPENCL CAF_BUILD_OPENCL)
# collect all compiler flags # collect all compiler flags
string(TOUPPER ${CMAKE_BUILD_TYPE} UPPER_BUILD_TYPE) string(TOUPPER "${CMAKE_BUILD_TYPE}" UPPER_BUILD_TYPE)
set(ALL_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_${UPPER_BUILD_TYPE}}") set(ALL_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_${UPPER_BUILD_TYPE}}")
# done # done
message(STATUS message(STATUS
......
...@@ -71,8 +71,8 @@ Usage: $0 [OPTION]... [VAR=VALUE]... ...@@ -71,8 +71,8 @@ Usage: $0 [OPTION]... [VAR=VALUE]...
CXXFLAGS C++ compiler flags CXXFLAGS C++ compiler flags
Benchmark Suite Options: Benchmark Suite Options:
--with-scalac path to scalac executable --with-scalac=FILE path to scalac executable
--with-erlc path to erlc executable --with-erlc=FILE path to erlc executable
" "
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment