3party/sqlpp11
0
0
Fork 0
mirror of https://github.com/rbock/sqlpp11.git synced 2024-11-16 04:47:18 +08:00
Code Issues Projects Releases Wiki Activity

Merge pull request #15 from elfring/Complete_quoting_for_parameters_of_some_CMake_commands

Browse Source 
Complete quoting for parameters of some CMake commands.
This commit is contained in:
rbock 2014-09-02 08:50:09 +02:00
commit e6e561ff04
3 changed files with 19 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -38,8 +38,8 @@ elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
endif () endif ()
set(include_dir "${PROJECT_SOURCE_DIR}/include") set(include_dir "${PROJECT_SOURCE_DIR}/include")
file(GLOB_RECURSE sqlpp_headers ${include_dir}/*.h) file(GLOB_RECURSE sqlpp_headers "${include_dir}/*.h")
include_directories(${include_dir}) include_directories("${include_dir}")
add_subdirectory(tests) add_subdirectory(tests)
add_subdirectory(test_constraints) add_subdirectory(test_constraints)

20
test_constraints/CMakeLists.txt
View File

@ -1,26 +1,26 @@
include_directories(${CMAKE_SOURCE_DIR}/tests) include_directories("${CMAKE_SOURCE_DIR}/tests")
add_custom_target(test_sqlpp_constraints COMMAND true) add_custom_target(test_sqlpp_constraints COMMAND true)
function(test_constraint name pattern) function(test_constraint name pattern)
add_executable( add_executable(
${name} "${name}"
EXCLUDE_FROM_ALL EXCLUDE_FROM_ALL
${name}.cpp "${name}.cpp"
) )
add_custom_command(OUTPUT ${name}.out add_custom_command(OUTPUT "${name}.out"
COMMAND ${CMAKE_MAKE_PROGRAM} ${name} > ${CMAKE_CURRENT_BINARY_DIR}/${name}.out 2>&1 || true COMMAND "${CMAKE_MAKE_PROGRAM}" "${name}" > "${CMAKE_CURRENT_BINARY_DIR}/${name}.out" 2>&1 || true
COMMAND grep ${pattern} ${CMAKE_CURRENT_BINARY_DIR}/${name}.out > /dev/null COMMAND grep "${pattern}" "${CMAKE_CURRENT_BINARY_DIR}/${name}.out" > /dev/null
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${name}.cpp DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/${name}.cpp"
COMMENT "${name}" COMMENT "${name}"
) VERBATIM)
add_custom_target(test_${name} DEPENDS ${name}.out COMMAND true) add_custom_target("test_${name}" DEPENDS "${name}.out" COMMAND true)
add_dependencies(test_sqlpp_constraints test_${name}) add_dependencies(test_sqlpp_constraints "test_${name}")
endfunction(test_constraint) endfunction(test_constraint)

15
tests/CMakeLists.txt
View File

@ -1,9 +1,9 @@
macro (build_and_run arg) macro (build_and_run arg)
# Add headers to sources to enable file browsing in IDEs # Add headers to sources to enable file browsing in IDEs
include_directories(${CMAKE_BINARY_DIR}/tests) include_directories("${CMAKE_BINARY_DIR}/tests")
add_executable(${arg} ${arg}.cpp ${sqlpp_headers} ${CMAKE_CURRENT_LIST_DIR}/Sample.h) add_executable("${arg}" "${arg}.cpp" ${sqlpp_headers} "${CMAKE_CURRENT_LIST_DIR}/Sample.h")
add_test(${arg} ${arg}) add_test("${arg}" "${arg}")
endmacro () endmacro ()
build_and_run(BooleanExpressionTest) build_and_run(BooleanExpressionTest)
@ -21,8 +21,7 @@ build_and_run(ResultTest)
# if you want to use the generator, you can do something like this: # if you want to use the generator, you can do something like this:
#find_package(PythonInterp REQUIRED) #find_package(PythonInterp REQUIRED)
#add_custom_command( #add_custom_command(
# OUTPUT ${CMAKE_CURRENT_LIST_DIR}/Sample.h # OUTPUT "${CMAKE_CURRENT_LIST_DIR}/Sample.h"
# COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/scripts/ddl2cpp ${CMAKE_CURRENT_LIST_DIR}/sample.sql Sample test # COMMAND "${PYTHON_EXECUTABLE}" "${CMAKE_SOURCE_DIR}/scripts/ddl2cpp" "${CMAKE_CURRENT_LIST_DIR}/sample.sql" Sample test
# DEPENDS ${CMAKE_CURRENT_LIST_DIR}/sample.sql # DEPENDS "${CMAKE_CURRENT_LIST_DIR}/sample.sql"
# ) # VERBATIM)