diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 1730a6efb..39689d82b 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -46,14 +46,14 @@ set(EMACS_LISP_DIR "share/emacs/site-lisp/lean" CACHE STRING "emacs site- set(LIBRARY_DIR "lib/lean" CACHE STRING "library dir") message(STATUS "Lean emacs-mode will be installed at " - ${CMAKE_INSTALL_PREFIX}/${EMACS_LISP_DIR}) + "${CMAKE_INSTALL_PREFIX}/${EMACS_LISP_DIR}") message(STATUS "Lean library will be installed at " - ${CMAKE_INSTALL_PREFIX}/${LIBRARY_DIR}) + "${CMAKE_INSTALL_PREFIX}/${LIBRARY_DIR}") # Added for CTest include(CTest) -configure_file(${LEAN_SOURCE_DIR}/CTestCustom.cmake.in - ${LEAN_BINARY_DIR}/CTestCustom.cmake @ONLY) +configure_file("${LEAN_SOURCE_DIR}/CTestCustom.cmake.in" + "${LEAN_BINARY_DIR}/CTestCustom.cmake" @ONLY) set(LEAN_EXTRA_LINKER_FLAGS "") set(LEAN_EXTRA_CXX_FLAGS "") @@ -98,7 +98,7 @@ if("${CMAKE_C_COMPILER}" MATCHES "emcc") endif() # Set Module Path -set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/") +set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules") # Initialize CXXFLAGS. set(CMAKE_CXX_FLAGS "-Wall -Wextra -std=c++11 ${LEAN_EXTRA_CXX_FLAGS} -DLEAN_BUILD_TYPE=\"${CMAKE_BUILD_TYPE}\"") @@ -131,14 +131,14 @@ endif() if("${TESTCOV}" MATCHES "ON") include(CodeCoverage) message(STATUS "Enable test-coverage") - set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -O0 -fprofile-arcs -ftest-coverage --coverage") - setup_target_for_coverage(cov ${LEAN_SOURCE_DIR}/../script/run_tests.sh coverage) + set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -O0 -fprofile-arcs -ftest-coverage --coverage") + setup_target_for_coverage(cov "${LEAN_SOURCE_DIR}/../script/run_tests.sh" coverage) endif() # Compiler-specific C++11 activation. if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU") execute_process( - COMMAND ${CMAKE_CXX_COMPILER} -dumpversion OUTPUT_VARIABLE GCC_VERSION) + COMMAND "${CMAKE_CXX_COMPILER}" -dumpversion OUTPUT_VARIABLE GCC_VERSION) if (NOT (GCC_VERSION VERSION_GREATER 4.8 OR GCC_VERSION VERSION_EQUAL 4.8)) message(FATAL_ERROR "${PROJECT_NAME} requires g++ 4.8 or greater.") endif () @@ -274,7 +274,7 @@ include(CPack) # Examples file(GLOB LEANLIB "${LEAN_SOURCE_DIR}/../examples/*.lean") FOREACH(FILE ${LEANLIB}) - install_files(/examples FILES ${FILE}) + install_files(/examples FILES "${FILE}") ENDFOREACH(FILE) include_directories(${LEAN_SOURCE_DIR}) @@ -349,11 +349,11 @@ add_subdirectory(tests/frontends/lean) # Include style check include(StyleCheck) file(GLOB_RECURSE LEAN_SOURCES - ${LEAN_SOURCE_DIR} - ${LEAN_SOURCE_DIR}/[A-Za-z]*.cpp - ${LEAN_SOURCE_DIR}/[A-Za-z]*.h) + "${LEAN_SOURCE_DIR}" + "${LEAN_SOURCE_DIR}/[A-Za-z]*.cpp" + "${LEAN_SOURCE_DIR}/[A-Za-z]*.h") add_style_check_target(style "${LEAN_SOURCES}") -add_test(NAME style_check COMMAND ${PYTHON_EXECUTABLE} ${LEAN_SOURCE_DIR}/cmake/Modules/cpplint.py ${LEAN_SOURCES}) +add_test(NAME style_check COMMAND "${PYTHON_EXECUTABLE}" "${LEAN_SOURCE_DIR}/cmake/Modules/cpplint.py" ${LEAN_SOURCES}) # Set PROCESSOR_COUNT if(NOT DEFINED PROCESSOR_COUNT) @@ -384,68 +384,68 @@ if("${CROSS_COMPILE}" MATCHES "ON" OR "${CMAKE_C_COMPILER}" MATCHES "emcc") else() add_custom_target( standard_lib ALL - COMMAND ${PYTHON_EXECUTABLE} ${LEAN_SOURCE_DIR}/../bin/linja all tags - DEPENDS ${CMAKE_BINARY_DIR}/shell/lean - WORKING_DIRECTORY ${LEAN_SOURCE_DIR}/../library + COMMAND "${PYTHON_EXECUTABLE}" "${LEAN_SOURCE_DIR}/../bin/linja" all tags + DEPENDS "${CMAKE_BINARY_DIR}/shell/lean" + WORKING_DIRECTORY "${LEAN_SOURCE_DIR}/../library" ) add_custom_target( hott_lib ALL - COMMAND ${PYTHON_EXECUTABLE} ${LEAN_SOURCE_DIR}/../bin/linja all tags - DEPENDS ${CMAKE_BINARY_DIR}/shell/lean - WORKING_DIRECTORY ${LEAN_SOURCE_DIR}/../hott + COMMAND "${PYTHON_EXECUTABLE}" "${LEAN_SOURCE_DIR}/../bin/linja" all tags + DEPENDS "${CMAKE_BINARY_DIR}/shell/lean" + WORKING_DIRECTORY "${LEAN_SOURCE_DIR}/../hott" ) endif() add_custom_target(clean-std-lib - WORKING_DIRECTORY ${LEAN_SOURCE_DIR}/../library - COMMAND ${CMAKE_COMMAND} -P ${CMAKE_MODULE_PATH}CleanOlean.cmake + WORKING_DIRECTORY "${LEAN_SOURCE_DIR}/../library" + COMMAND "${CMAKE_COMMAND}" -P "${CMAKE_MODULE_PATH}/CleanOlean.cmake" ) add_custom_target(clean-hott-lib - WORKING_DIRECTORY ${LEAN_SOURCE_DIR}/../hott - COMMAND ${CMAKE_COMMAND} -P ${CMAKE_MODULE_PATH}CleanOlean.cmake + WORKING_DIRECTORY "${LEAN_SOURCE_DIR}/../hott" + COMMAND "${CMAKE_COMMAND}" -P "${CMAKE_MODULE_PATH}/CleanOlean.cmake" ) add_custom_target(clean-olean DEPENDS clean-std-lib clean-hott-lib) -install(FILES ${CMAKE_SOURCE_DIR}/../bin/linja ${CMAKE_SOURCE_DIR}/../bin/leantags +install(FILES "${CMAKE_SOURCE_DIR}/../bin/linja" "${CMAKE_SOURCE_DIR}/../bin/leantags" DESTINATION bin PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) if(${CMAKE_SYSTEM_NAME} MATCHES "Windows") - install(FILES ${CMAKE_SOURCE_DIR}/../bin/leanemacs.bat ${CMAKE_SOURCE_DIR}/../bin/leanemacs.bat + install(FILES "${CMAKE_SOURCE_DIR}/../bin/leanemacs.bat" "${CMAKE_SOURCE_DIR}/../bin/leanemacs.bat" DESTINATION bin PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) else() - install(FILES ${CMAKE_SOURCE_DIR}/../bin/leanemacs ${CMAKE_SOURCE_DIR}/../bin/leanemacs + install(FILES "${CMAKE_SOURCE_DIR}/../bin/leanemacs" "${CMAKE_SOURCE_DIR}/../bin/leanemacs" DESTINATION bin PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) endif() -install(DIRECTORY ${CMAKE_SOURCE_DIR}/../library DESTINATION ${LIBRARY_DIR} +install(DIRECTORY "${CMAKE_SOURCE_DIR}/../library" DESTINATION "${LIBRARY_DIR}" FILES_MATCHING PATTERN "*.lean") -install(DIRECTORY ${CMAKE_SOURCE_DIR}/../library DESTINATION ${LIBRARY_DIR} +install(DIRECTORY "${CMAKE_SOURCE_DIR}/../library" DESTINATION "${LIBRARY_DIR}" FILES_MATCHING PATTERN "*.lean" PATTERN "*.olean" PATTERN ".project" PATTERN "TAGS") -install(DIRECTORY ${CMAKE_SOURCE_DIR}/../hott DESTINATION ${LIBRARY_DIR} +install(DIRECTORY "${CMAKE_SOURCE_DIR}/../hott" DESTINATION "${LIBRARY_DIR}" FILES_MATCHING PATTERN "*.hlean") -install(DIRECTORY ${CMAKE_SOURCE_DIR}/../hott DESTINATION ${LIBRARY_DIR} +install(DIRECTORY "${CMAKE_SOURCE_DIR}/../hott" DESTINATION "${LIBRARY_DIR}" FILES_MATCHING PATTERN "*.lean" PATTERN "*.olean" PATTERN ".project" PATTERN "TAGS") -install(FILES ${CMAKE_SOURCE_DIR}/../src/emacs/lean.pgm - DESTINATION ${EMACS_LISP_DIR}) +install(FILES "${CMAKE_SOURCE_DIR}/../src/emacs/lean.pgm" + DESTINATION "${EMACS_LISP_DIR}") if(EXISTS "${EMACS_DEPENDENCIES}") - install(DIRECTORY ${EMACS_DEPENDENCIES}/ DESTINATION ${EMACS_LISP_DIR}/dependencies + install(DIRECTORY "${EMACS_DEPENDENCIES}/" DESTINATION "${EMACS_LISP_DIR}/dependencies" FILES_MATCHING PATTERN "*.el" PATTERN "dir" diff --git a/src/emacs/CMakeLists.txt b/src/emacs/CMakeLists.txt index d7389f7ec..5267bb812 100644 --- a/src/emacs/CMakeLists.txt +++ b/src/emacs/CMakeLists.txt @@ -1,2 +1,2 @@ FILE(GLOB LEAN_MODE_FILES *.el) -install(FILES ${LEAN_MODE_FILES} DESTINATION ${EMACS_LISP_DIR}) +install(FILES ${LEAN_MODE_FILES} DESTINATION "${EMACS_LISP_DIR}") diff --git a/src/shell/CMakeLists.txt b/src/shell/CMakeLists.txt index b72b4abc8..5bab86e03 100644 --- a/src/shell/CMakeLists.txt +++ b/src/shell/CMakeLists.txt @@ -6,8 +6,8 @@ else() target_link_libraries(lean ${ALL_LIBS}) ADD_CUSTOM_COMMAND(TARGET lean POST_BUILD - COMMAND ${CMAKE_COMMAND} -E make_directory ${LEAN_SOURCE_DIR}/../bin - COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_BINARY_DIR}/lean${CMAKE_EXECUTABLE_SUFFIX} ${LEAN_SOURCE_DIR}/../bin/ + COMMAND "${CMAKE_COMMAND}" -E make_directory "${LEAN_SOURCE_DIR}/../bin" + COMMAND "${CMAKE_COMMAND}" -E copy "${CMAKE_CURRENT_BINARY_DIR}/lean${CMAKE_EXECUTABLE_SUFFIX}" "${LEAN_SOURCE_DIR}/../bin/" ) install(TARGETS lean DESTINATION bin) endif() @@ -16,24 +16,24 @@ endif() # add_test(example1_stdin2 ${LEAN_SOURCE_DIR}/cmake/redirect.sh ${CMAKE_CURRENT_BINARY_DIR}/lean "-l" "${LEAN_SOURCE_DIR}/../tests/lean/single.lean") # add_test(example1_stdin3 ${LEAN_SOURCE_DIR}/cmake/redirect.sh ${CMAKE_CURRENT_BINARY_DIR}/lean "--lean" "${LEAN_SOURCE_DIR}/../tests/lean/single.lean") # add_test(lean_export ${CMAKE_CURRENT_BINARY_DIR}/lean "-o simple.olean" "${LEAN_SOURCE_DIR}/../tests/lean/run/simple.lean") -add_test(lean_help1 ${CMAKE_CURRENT_BINARY_DIR}/lean --help) -add_test(lean_help2 ${CMAKE_CURRENT_BINARY_DIR}/lean -h) -add_test(lean_version1 ${CMAKE_CURRENT_BINARY_DIR}/lean --version) -add_test(lean_version2 ${CMAKE_CURRENT_BINARY_DIR}/lean --v) -add_test(lean_ghash1 ${CMAKE_CURRENT_BINARY_DIR}/lean -g) -add_test(lean_ghash2 ${CMAKE_CURRENT_BINARY_DIR}/lean --githash) -add_test(lean_path1 ${CMAKE_CURRENT_BINARY_DIR}/lean -p) -add_test(lean_path2 ${CMAKE_CURRENT_BINARY_DIR}/lean --path) -add_test(lean_luahook1 ${CMAKE_CURRENT_BINARY_DIR}/lean --luahook=100 "${LEAN_SOURCE_DIR}/../tests/lua/big.lua") -add_test(lean_luahook2 ${CMAKE_CURRENT_BINARY_DIR}/lean -k 100 "${LEAN_SOURCE_DIR}/../tests/lua/big.lua") +add_test(lean_help1 "${CMAKE_CURRENT_BINARY_DIR}/lean" --help) +add_test(lean_help2 "${CMAKE_CURRENT_BINARY_DIR}/lean" -h) +add_test(lean_version1 "${CMAKE_CURRENT_BINARY_DIR}/lean" --version) +add_test(lean_version2 "${CMAKE_CURRENT_BINARY_DIR}/lean" --v) +add_test(lean_ghash1 "${CMAKE_CURRENT_BINARY_DIR}/lean" -g) +add_test(lean_ghash2 "${CMAKE_CURRENT_BINARY_DIR}/lean" --githash) +add_test(lean_path1 "${CMAKE_CURRENT_BINARY_DIR}/lean" -p) +add_test(lean_path2 "${CMAKE_CURRENT_BINARY_DIR}/lean" --path) +add_test(lean_luahook1 "${CMAKE_CURRENT_BINARY_DIR}/lean" --luahook=100 "${LEAN_SOURCE_DIR}/../tests/lua/big.lua") +add_test(lean_luahook2 "${CMAKE_CURRENT_BINARY_DIR}/lean" -k 100 "${LEAN_SOURCE_DIR}/../tests/lua/big.lua") # add_test(lean_lua1 ${LEAN_SOURCE_DIR}/cmake/redirect.sh "${CMAKE_CURRENT_BINARY_DIR}/lean" "--lua" "${LEAN_SOURCE_DIR}/../tests/lua/single.lua") # add_test(lean_lua2 ${LEAN_SOURCE_DIR}/cmake/redirect.sh "${CMAKE_CURRENT_BINARY_DIR}/lean" "-u" "${LEAN_SOURCE_DIR}/../tests/lua/single.lua") -add_test(lean_unknown_option bash ${LEAN_SOURCE_DIR}/cmake/check_failure.sh "${CMAKE_CURRENT_BINARY_DIR}/lean" "-z") -add_test(lean_unknown_file1 bash ${LEAN_SOURCE_DIR}/cmake/check_failure.sh "${CMAKE_CURRENT_BINARY_DIR}/lean" "boofoo.lean") -add_test(lean_unknown_file2 bash ${LEAN_SOURCE_DIR}/cmake/check_failure.sh "${CMAKE_CURRENT_BINARY_DIR}/lean" "boofoo.lua") -add_test(lean_server_trace ${CMAKE_CURRENT_BINARY_DIR}/lean --server-trace "${LEAN_SOURCE_DIR}/../tests/lean/interactive/consume_args.input") -add_test(lean_server_trace ${CMAKE_CURRENT_BINARY_DIR}/lean --server-trace "${LEAN_SOURCE_DIR}/../tests/lean/interactive/options_cmd.trace") -add_test(lean_server_trace ${CMAKE_CURRENT_BINARY_DIR}/lean --server-trace "${LEAN_SOURCE_DIR}/../tests/lean/interactive/commands.trace") +add_test(lean_unknown_option bash "${LEAN_SOURCE_DIR}/cmake/check_failure.sh" "${CMAKE_CURRENT_BINARY_DIR}/lean" "-z") +add_test(lean_unknown_file1 bash "${LEAN_SOURCE_DIR}/cmake/check_failure.sh" "${CMAKE_CURRENT_BINARY_DIR}/lean" "boofoo.lean") +add_test(lean_unknown_file2 bash "${LEAN_SOURCE_DIR}/cmake/check_failure.sh" "${CMAKE_CURRENT_BINARY_DIR}/lean" "boofoo.lua") +add_test(lean_server_trace "${CMAKE_CURRENT_BINARY_DIR}/lean" --server-trace "${LEAN_SOURCE_DIR}/../tests/lean/interactive/consume_args.input") +add_test(lean_server_trace "${CMAKE_CURRENT_BINARY_DIR}/lean" --server-trace "${LEAN_SOURCE_DIR}/../tests/lean/interactive/options_cmd.trace") +add_test(lean_server_trace "${CMAKE_CURRENT_BINARY_DIR}/lean" --server-trace "${LEAN_SOURCE_DIR}/../tests/lean/interactive/commands.trace") add_test(NAME "lean_eqn_macro" WORKING_DIRECTORY "${LEAN_SOURCE_DIR}/../tests/lean/extra" COMMAND bash "./test_eqn_macro.sh" "${CMAKE_CURRENT_BINARY_DIR}/lean") diff --git a/src/tests/frontends/lean/CMakeLists.txt b/src/tests/frontends/lean/CMakeLists.txt index 3d9763047..294a7609d 100644 --- a/src/tests/frontends/lean/CMakeLists.txt +++ b/src/tests/frontends/lean/CMakeLists.txt @@ -1,9 +1,9 @@ add_executable(lean_scanner scanner.cpp) target_link_libraries(lean_scanner "init" "lean_frontend" "library" "kernel" "util" ${EXTRA_LIBS}) -add_test(lean_scanner ${CMAKE_CURRENT_BINARY_DIR}/lean_scanner) +add_test(lean_scanner "${CMAKE_CURRENT_BINARY_DIR}/lean_scanner") # add_executable(lean_parser parser.cpp) # target_link_libraries(lean_parser ${ALL_LIBS}) -# add_test(lean_parser ${CMAKE_CURRENT_BINARY_DIR}/lean_parser) +# add_test(lean_parser "${CMAKE_CURRENT_BINARY_DIR}/lean_parser") # # add_executable(lean_pp pp.cpp) # target_link_libraries(lean_pp ${ALL_LIBS}) -# add_test(lean_pp ${CMAKE_CURRENT_BINARY_DIR}/lean_pp) +# add_test(lean_pp "${CMAKE_CURRENT_BINARY_DIR}/lean_pp") diff --git a/src/tests/kernel/CMakeLists.txt b/src/tests/kernel/CMakeLists.txt index 59464eee4..f1d4c04aa 100644 --- a/src/tests/kernel/CMakeLists.txt +++ b/src/tests/kernel/CMakeLists.txt @@ -1,24 +1,24 @@ add_executable(level level.cpp) target_link_libraries(level "library" "kernel" "util" ${EXTRA_LIBS}) -add_test(level ${CMAKE_CURRENT_BINARY_DIR}/level) +add_test(level "${CMAKE_CURRENT_BINARY_DIR}/level") add_executable(expr expr.cpp) target_link_libraries(expr "library" "kernel" "util" ${EXTRA_LIBS}) -add_test(expr ${CMAKE_CURRENT_BINARY_DIR}/expr) +add_test(expr "${CMAKE_CURRENT_BINARY_DIR}/expr") add_executable(max_sharing max_sharing.cpp) target_link_libraries(max_sharing "kernel" "library" "util" ${EXTRA_LIBS}) -add_test(max_sharing ${CMAKE_CURRENT_BINARY_DIR}/max_sharing) +add_test(max_sharing "${CMAKE_CURRENT_BINARY_DIR}/max_sharing") add_executable(free_vars free_vars.cpp) target_link_libraries(free_vars "kernel" "util" ${EXTRA_LIBS}) -add_test(free_vars ${CMAKE_CURRENT_BINARY_DIR}/free_vars) +add_test(free_vars "${CMAKE_CURRENT_BINARY_DIR}/free_vars") add_executable(replace replace.cpp) target_link_libraries(replace "library" "kernel" "util" ${EXTRA_LIBS}) -add_test(replace ${CMAKE_CURRENT_BINARY_DIR}/replace) +add_test(replace "${CMAKE_CURRENT_BINARY_DIR}/replace") add_executable(environment environment.cpp) target_link_libraries(environment "library" "kernel" "util" ${EXTRA_LIBS}) -add_test(environment ${CMAKE_CURRENT_BINARY_DIR}/environment) +add_test(environment "${CMAKE_CURRENT_BINARY_DIR}/environment") add_executable(metavar metavar.cpp) target_link_libraries(metavar "library" "kernel" "util" ${EXTRA_LIBS}) -add_test(metavar ${CMAKE_CURRENT_BINARY_DIR}/metavar) +add_test(metavar "${CMAKE_CURRENT_BINARY_DIR}/metavar") add_executable(instantiate instantiate.cpp) target_link_libraries(instantiate "kernel" "util" ${EXTRA_LIBS}) -add_test(instantiate ${CMAKE_CURRENT_BINARY_DIR}/instantiate) +add_test(instantiate "${CMAKE_CURRENT_BINARY_DIR}/instantiate") diff --git a/src/tests/library/CMakeLists.txt b/src/tests/library/CMakeLists.txt index a8ec0dcd5..0ca485062 100644 --- a/src/tests/library/CMakeLists.txt +++ b/src/tests/library/CMakeLists.txt @@ -1,15 +1,15 @@ add_executable(expr_lt expr_lt.cpp) target_link_libraries(expr_lt "library" "kernel" "util" ${EXTRA_LIBS}) -add_test(expr_lt ${CMAKE_CURRENT_BINARY_DIR}/expr_lt) +add_test(expr_lt "${CMAKE_CURRENT_BINARY_DIR}/expr_lt") add_executable(deep_copy deep_copy.cpp) target_link_libraries(deep_copy "library" "kernel" "util" ${EXTRA_LIBS}) -add_test(deep_copy ${CMAKE_CURRENT_BINARY_DIR}/deep_copy) +add_test(deep_copy "${CMAKE_CURRENT_BINARY_DIR}/deep_copy") add_executable(occurs occurs.cpp) target_link_libraries(occurs "library" "kernel" "util" ${EXTRA_LIBS}) -add_test(occurs ${CMAKE_CURRENT_BINARY_DIR}/occurs) +add_test(occurs "${CMAKE_CURRENT_BINARY_DIR}/occurs") add_executable(unifier unifier.cpp) target_link_libraries(unifier "library" "kernel" "util" ${EXTRA_LIBS}) -add_test(unifier ${CMAKE_CURRENT_BINARY_DIR}/unifier) +add_test(unifier "${CMAKE_CURRENT_BINARY_DIR}/unifier") add_executable(head_map head_map.cpp) target_link_libraries(head_map "library" "kernel" "util" ${EXTRA_LIBS}) -add_test(head_map ${CMAKE_CURRENT_BINARY_DIR}/head_map) +add_test(head_map "${CMAKE_CURRENT_BINARY_DIR}/head_map") diff --git a/src/tests/library/rewriter/CMakeLists.txt b/src/tests/library/rewriter/CMakeLists.txt index 7c5ef74f8..6c24e7eed 100644 --- a/src/tests/library/rewriter/CMakeLists.txt +++ b/src/tests/library/rewriter/CMakeLists.txt @@ -1,8 +1,8 @@ add_executable(rewriter_tst rewriter.cpp) target_link_libraries(rewriter_tst ${EXTRA_LIBS}) -add_test(rewriter_tst ${CMAKE_CURRENT_BINARY_DIR}/rewriter_tst) +add_test(rewriter_tst "${CMAKE_CURRENT_BINARY_DIR}/rewriter_tst") set_tests_properties(rewriter_tst PROPERTIES ENVIRONMENT "LEAN_PATH=${LEAN_BINARY_DIR}/shell") add_executable(fo_match_tst fo_match.cpp) target_link_libraries(fo_match_tst ${EXTRA_LIBS}) -add_test(fo_match_tst ${CMAKE_CURRENT_BINARY_DIR}/fo_match_tst) +add_test(fo_match_tst "${CMAKE_CURRENT_BINARY_DIR}/fo_match_tst") diff --git a/src/tests/library/tactic/CMakeLists.txt b/src/tests/library/tactic/CMakeLists.txt index 4e012033e..66a1591f3 100644 --- a/src/tests/library/tactic/CMakeLists.txt +++ b/src/tests/library/tactic/CMakeLists.txt @@ -1,4 +1,4 @@ add_executable(tactic_tst tactic.cpp) target_link_libraries(tactic_tst ${EXTRA_LIBS}) -add_test(tactic ${CMAKE_CURRENT_BINARY_DIR}/tactic_tst) +add_test(tactic "${CMAKE_CURRENT_BINARY_DIR}/tactic_tst") set_tests_properties(tactic PROPERTIES ENVIRONMENT "LEAN_PATH=${LEAN_BINARY_DIR}/shell") diff --git a/src/tests/util/CMakeLists.txt b/src/tests/util/CMakeLists.txt index f71902e08..dfc3456e7 100644 --- a/src/tests/util/CMakeLists.txt +++ b/src/tests/util/CMakeLists.txt @@ -1,93 +1,93 @@ add_executable(name name.cpp) target_link_libraries(name "util" ${EXTRA_LIBS}) -add_test(name ${CMAKE_CURRENT_BINARY_DIR}/name) +add_test(name "${CMAKE_CURRENT_BINARY_DIR}/name") add_executable(sequence sequence.cpp) target_link_libraries(sequence "util" ${EXTRA_LIBS}) -add_test(sequence ${CMAKE_CURRENT_BINARY_DIR}/sequence) +add_test(sequence "${CMAKE_CURRENT_BINARY_DIR}/sequence") add_executable(sexpr_tst sexpr.cpp) target_link_libraries(sexpr_tst "util" "numerics" "sexpr" ${EXTRA_LIBS}) -add_test(sexpr ${CMAKE_CURRENT_BINARY_DIR}/sexpr_tst) +add_test(sexpr "${CMAKE_CURRENT_BINARY_DIR}/sexpr_tst") add_executable(format format.cpp) target_link_libraries(format "util" "numerics" "sexpr" ${EXTRA_LIBS}) -add_test(format ${CMAKE_CURRENT_BINARY_DIR}/format) +add_test(format "${CMAKE_CURRENT_BINARY_DIR}/format") add_executable(buffer buffer.cpp) target_link_libraries(buffer "util" ${EXTRA_LIBS}) -add_test(buffer ${CMAKE_CURRENT_BINARY_DIR}/buffer) +add_test(buffer "${CMAKE_CURRENT_BINARY_DIR}/buffer") add_executable(list list.cpp) target_link_libraries(list "util" ${EXTRA_LIBS}) -add_test(list ${CMAKE_CURRENT_BINARY_DIR}/list) +add_test(list "${CMAKE_CURRENT_BINARY_DIR}/list") add_executable(scoped_set scoped_set.cpp) target_link_libraries(scoped_set "util" ${EXTRA_LIBS}) -add_test(scoped_set ${CMAKE_CURRENT_BINARY_DIR}/scoped_set) +add_test(scoped_set "${CMAKE_CURRENT_BINARY_DIR}/scoped_set") add_executable(options options.cpp) target_link_libraries(options "util" "numerics" "sexpr" ${EXTRA_LIBS}) -add_test(options ${CMAKE_CURRENT_BINARY_DIR}/options) +add_test(options "${CMAKE_CURRENT_BINARY_DIR}/options") add_executable(scoped_map scoped_map.cpp) target_link_libraries(scoped_map "util" ${EXTRA_LIBS}) -add_test(scoped_map ${CMAKE_CURRENT_BINARY_DIR}/scoped_map) +add_test(scoped_map "${CMAKE_CURRENT_BINARY_DIR}/scoped_map") add_executable(memory memory.cpp) target_link_libraries(memory "util" ${EXTRA_LIBS}) -add_test(memory ${CMAKE_CURRENT_BINARY_DIR}/memory) +add_test(memory "${CMAKE_CURRENT_BINARY_DIR}/memory") add_executable(rb_tree rb_tree.cpp) target_link_libraries(rb_tree "util" ${EXTRA_LIBS}) -add_test(rb_tree ${CMAKE_CURRENT_BINARY_DIR}/rb_tree) +add_test(rb_tree "${CMAKE_CURRENT_BINARY_DIR}/rb_tree") add_executable(rb_map rb_map.cpp) target_link_libraries(rb_map "util" ${EXTRA_LIBS}) -add_test(rb_map ${CMAKE_CURRENT_BINARY_DIR}/rb_map) +add_test(rb_map "${CMAKE_CURRENT_BINARY_DIR}/rb_map") add_executable(splay_tree splay_tree.cpp) target_link_libraries(splay_tree "util" ${EXTRA_LIBS}) -add_test(splay_tree ${CMAKE_CURRENT_BINARY_DIR}/splay_tree) +add_test(splay_tree "${CMAKE_CURRENT_BINARY_DIR}/splay_tree") add_executable(splay_map splay_map.cpp) target_link_libraries(splay_map "util" ${EXTRA_LIBS}) -add_test(splay_map ${CMAKE_CURRENT_BINARY_DIR}/splay_map) +add_test(splay_map "${CMAKE_CURRENT_BINARY_DIR}/splay_map") add_executable(trace trace.cpp) target_link_libraries(trace "util" ${EXTRA_LIBS}) -add_test(trace ${CMAKE_CURRENT_BINARY_DIR}/trace) +add_test(trace "${CMAKE_CURRENT_BINARY_DIR}/trace") add_executable(exception exception.cpp) target_link_libraries(exception "util" ${EXTRA_LIBS}) -add_test(exception ${CMAKE_CURRENT_BINARY_DIR}/exception) +add_test(exception "${CMAKE_CURRENT_BINARY_DIR}/exception") add_executable(bit_tricks bit_tricks.cpp) target_link_libraries(bit_tricks "util" ${EXTRA_LIBS}) -add_test(bit_tricks ${CMAKE_CURRENT_BINARY_DIR}/bit_tricks) +add_test(bit_tricks "${CMAKE_CURRENT_BINARY_DIR}/bit_tricks") add_executable(lazy_list lazy_list.cpp) target_link_libraries(lazy_list "util" "numerics" ${EXTRA_LIBS}) -add_test(lazy_list ${CMAKE_CURRENT_BINARY_DIR}/lazy_list) +add_test(lazy_list "${CMAKE_CURRENT_BINARY_DIR}/lazy_list") add_executable(hash hash.cpp) target_link_libraries(hash "util" ${EXTRA_LIBS}) -add_test(hash ${CMAKE_CURRENT_BINARY_DIR}/hash) +add_test(hash "${CMAKE_CURRENT_BINARY_DIR}/hash") add_executable(safe_arith safe_arith.cpp) target_link_libraries(safe_arith "util" ${EXTRA_LIBS}) -add_test(safe_arith ${CMAKE_CURRENT_BINARY_DIR}/safe_arith) +add_test(safe_arith "${CMAKE_CURRENT_BINARY_DIR}/safe_arith") add_executable(set set.cpp) target_link_libraries(set "util" ${EXTRA_LIBS}) -add_test(set ${CMAKE_CURRENT_BINARY_DIR}/set) +add_test(set "${CMAKE_CURRENT_BINARY_DIR}/set") add_executable(optional optional.cpp) target_link_libraries(optional "util" ${EXTRA_LIBS}) -add_test(optional ${CMAKE_CURRENT_BINARY_DIR}/optional) +add_test(optional "${CMAKE_CURRENT_BINARY_DIR}/optional") add_executable(stackinfo stackinfo.cpp) target_link_libraries(stackinfo "util" ${EXTRA_LIBS}) -add_test(stackinfo ${CMAKE_CURRENT_BINARY_DIR}/stackinfo) +add_test(stackinfo "${CMAKE_CURRENT_BINARY_DIR}/stackinfo") add_executable(serializer serializer.cpp) target_link_libraries(serializer "util" ${EXTRA_LIBS}) -add_test(serializer ${CMAKE_CURRENT_BINARY_DIR}/serializer) +add_test(serializer "${CMAKE_CURRENT_BINARY_DIR}/serializer") add_executable(trie trie.cpp) target_link_libraries(trie "util" ${EXTRA_LIBS}) -add_test(trie ${CMAKE_CURRENT_BINARY_DIR}/trie) +add_test(trie "${CMAKE_CURRENT_BINARY_DIR}/trie") add_executable(lru_cache lru_cache.cpp) target_link_libraries(lru_cache "util" ${EXTRA_LIBS}) -add_test(lru_cache ${CMAKE_CURRENT_BINARY_DIR}/lru_cache) +add_test(lru_cache "${CMAKE_CURRENT_BINARY_DIR}/lru_cache") add_executable(worker_queue worker_queue.cpp) target_link_libraries(worker_queue "util" ${EXTRA_LIBS}) -add_test(worker_queue ${CMAKE_CURRENT_BINARY_DIR}/worker_queue) +add_test(worker_queue "${CMAKE_CURRENT_BINARY_DIR}/worker_queue") # thread.cpp used import_test.lua -add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/import_test.lua - COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/import_test.lua ${CMAKE_CURRENT_BINARY_DIR}/import_test.lua - DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/import_test.lua) -add_custom_target("import_test" DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/import_test.lua) +add_custom_command(OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/import_test.lua" + COMMAND "${CMAKE_COMMAND}" -E copy "${CMAKE_CURRENT_SOURCE_DIR}/import_test.lua" "${CMAKE_CURRENT_BINARY_DIR}/import_test.lua" + DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/import_test.lua") +add_custom_target("import_test" DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/import_test.lua") add_executable(thread thread.cpp) target_link_libraries(thread "util" ${EXTRA_LIBS}) -add_test(thread ${CMAKE_CURRENT_BINARY_DIR}/thread) +add_test(thread "${CMAKE_CURRENT_BINARY_DIR}/thread") add_dependencies(thread import_test) add_executable(bitap_fuzzy_search bitap_fuzzy_search.cpp) target_link_libraries(bitap_fuzzy_search "util" ${EXTRA_LIBS}) -add_test(bitap_fuzzy_search ${CMAKE_CURRENT_BINARY_DIR}/bitap_fuzzy_search) +add_test(bitap_fuzzy_search "${CMAKE_CURRENT_BINARY_DIR}/bitap_fuzzy_search") diff --git a/src/tests/util/interval/CMakeLists.txt b/src/tests/util/interval/CMakeLists.txt index 53b0b805b..66ecf6017 100644 --- a/src/tests/util/interval/CMakeLists.txt +++ b/src/tests/util/interval/CMakeLists.txt @@ -1,15 +1,15 @@ add_executable(interval_tst interval.cpp) target_link_libraries(interval_tst "interval" "numerics" "util" ${EXTRA_LIBS}) -add_test(basic_interval ${CMAKE_CURRENT_BINARY_DIR}/interval_tst) +add_test(basic_interval "${CMAKE_CURRENT_BINARY_DIR}/interval_tst") add_executable(float_interval_tst float_interval.cpp) target_link_libraries(float_interval_tst "interval" "numerics" "util" ${EXTRA_LIBS}) -add_test(float_interval ${CMAKE_CURRENT_BINARY_DIR}/float_interval_tst) +add_test(float_interval "${CMAKE_CURRENT_BINARY_DIR}/float_interval_tst") add_executable(double_interval_tst double_interval.cpp) target_link_libraries(double_interval_tst "interval" "numerics" "util" ${EXTRA_LIBS}) -add_test(double_interval ${CMAKE_CURRENT_BINARY_DIR}/double_interval_tst) +add_test(double_interval "${CMAKE_CURRENT_BINARY_DIR}/double_interval_tst") add_executable(mpfp_interval_tst mpfp_interval.cpp) target_link_libraries(mpfp_interval_tst "interval" "numerics" "util" ${EXTRA_LIBS}) -add_test(mpfp_interval ${CMAKE_CURRENT_BINARY_DIR}/mpfp_interval_tst) +add_test(mpfp_interval "${CMAKE_CURRENT_BINARY_DIR}/mpfp_interval_tst") diff --git a/src/tests/util/numerics/CMakeLists.txt b/src/tests/util/numerics/CMakeLists.txt index 28cfbeee8..905bdef9e 100644 --- a/src/tests/util/numerics/CMakeLists.txt +++ b/src/tests/util/numerics/CMakeLists.txt @@ -1,33 +1,33 @@ add_executable(mpq mpq.cpp) target_link_libraries(mpq "numerics" "util" ${EXTRA_LIBS}) -add_test(mpq ${CMAKE_CURRENT_BINARY_DIR}/mpq) +add_test(mpq "${CMAKE_CURRENT_BINARY_DIR}/mpq") add_executable(mpbq mpbq.cpp) target_link_libraries(mpbq "numerics" "util" ${EXTRA_LIBS}) -add_test(mpbq ${CMAKE_CURRENT_BINARY_DIR}/mpbq) +add_test(mpbq "${CMAKE_CURRENT_BINARY_DIR}/mpbq") add_executable(mpfp mpfp.cpp) target_link_libraries(mpfp "numerics" "util" ${EXTRA_LIBS}) -add_test(mpfp ${CMAKE_CURRENT_BINARY_DIR}/mpfp) +add_test(mpfp "${CMAKE_CURRENT_BINARY_DIR}/mpfp") add_executable(mpz mpz.cpp) target_link_libraries(mpz "numerics" "util" ${EXTRA_LIBS}) -add_test(mpz ${CMAKE_CURRENT_BINARY_DIR}/mpz) +add_test(mpz "${CMAKE_CURRENT_BINARY_DIR}/mpz") add_executable(double double.cpp) target_link_libraries(double "numerics" "util" ${EXTRA_LIBS}) -add_test(double ${CMAKE_CURRENT_BINARY_DIR}/double) +add_test(double "${CMAKE_CURRENT_BINARY_DIR}/double") add_executable(float float.cpp) target_link_libraries(float "numerics" "util" ${EXTRA_LIBS}) -add_test(float ${CMAKE_CURRENT_BINARY_DIR}/float) +add_test(float "${CMAKE_CURRENT_BINARY_DIR}/float") add_executable(xnumeral xnumeral.cpp) target_link_libraries(xnumeral "numerics" "util" ${EXTRA_LIBS}) -add_test(xnumeral ${CMAKE_CURRENT_BINARY_DIR}/xnumeral) +add_test(xnumeral "${CMAKE_CURRENT_BINARY_DIR}/xnumeral") add_executable(primes primes.cpp) target_link_libraries(primes "numerics" "util" ${EXTRA_LIBS}) -add_test(primes ${CMAKE_CURRENT_BINARY_DIR}/primes) +add_test(primes "${CMAKE_CURRENT_BINARY_DIR}/primes") add_executable(numeric_traits numeric_traits.cpp) target_link_libraries(numeric_traits "numerics" "util" ${EXTRA_LIBS}) -add_test(numeric_traits ${CMAKE_CURRENT_BINARY_DIR}/numeric_traits) +add_test(numeric_traits "${CMAKE_CURRENT_BINARY_DIR}/numeric_traits") add_executable(gcd gcd.cpp) target_link_libraries(gcd "numerics" "util" ${EXTRA_LIBS}) -add_test(gcd ${CMAKE_CURRENT_BINARY_DIR}/gcd) +add_test(gcd "${CMAKE_CURRENT_BINARY_DIR}/gcd") add_executable(zpz zpz.cpp) target_link_libraries(zpz "numerics" "util" ${EXTRA_LIBS}) -add_test(zpz ${CMAKE_CURRENT_BINARY_DIR}/zpz) +add_test(zpz "${CMAKE_CURRENT_BINARY_DIR}/zpz")