updated build system
Some checks failed
BlockStorage/repertory/pipeline/head There was a failure building this commit
Some checks failed
BlockStorage/repertory/pipeline/head There was a failure building this commit
This commit is contained in:
parent
035f830b71
commit
0225fb8e5d
@ -63,9 +63,9 @@ if(PROJECT_BUILD)
|
|||||||
endif()
|
endif()
|
||||||
|
|
||||||
file(GLOB_RECURSE ADDITIONAL_SOURCES
|
file(GLOB_RECURSE ADDITIONAL_SOURCES
|
||||||
${PROJECT_3RD_PARTY_DIR}/src/*.c
|
|
||||||
${PROJECT_3RD_PARTY_DIR}/src/*.cpp
|
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_NAME}/version.cpp
|
${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_NAME}/version.cpp
|
||||||
|
${PROJECT_SUPPORT_DIR}/src/*.c
|
||||||
|
${PROJECT_SUPPORT_DIR}/src/*.cpp
|
||||||
)
|
)
|
||||||
|
|
||||||
list(APPEND PROJECT_ADDITIONAL_SOURCES
|
list(APPEND PROJECT_ADDITIONAL_SOURCES
|
||||||
|
@ -105,20 +105,20 @@ function(add_project_test_executable name dependencies libraries)
|
|||||||
enable_testing()
|
enable_testing()
|
||||||
|
|
||||||
file(GLOB_RECURSE headers
|
file(GLOB_RECURSE headers
|
||||||
${PROJECT_SUPPORT_DIR}/test/include/*.hpp
|
${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_NAME}/${name}/include/${name}/include/${name}/include/*.hxx
|
||||||
|
${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_NAME}/${name}/include/${name}/include/*.hpp
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_NAME}/${name}/include/*.h
|
${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_NAME}/${name}/include/*.h
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_NAME}/${name}/include/*.hh
|
${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_NAME}/${name}/include/*.hh
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_NAME}/${name}/include/${name}/include/*.hpp
|
${PROJECT_SUPPORT_DIR}/test/include/*.hpp
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_NAME}/${name}/include/${name}/include/${name}/include/*.hxx
|
|
||||||
)
|
)
|
||||||
|
|
||||||
file(GLOB_RECURSE sources
|
file(GLOB_RECURSE sources
|
||||||
${PROJECT_SUPPORT_DIR}/test/src/*.cpp
|
|
||||||
${additional_sources}
|
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_NAME}/${name}/src/*.c
|
${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_NAME}/${name}/src/*.c
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_NAME}/${name}/src/*.cc
|
${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_NAME}/${name}/src/*.cc
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_NAME}/${name}/src/*.cpp
|
${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_NAME}/${name}/src/*.cpp
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_NAME}/${name}/src/*.cxx
|
${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_NAME}/${name}/src/*.cxx
|
||||||
|
${PROJECT_SUPPORT_DIR}/test/src/*.cpp
|
||||||
|
${additional_sources}
|
||||||
)
|
)
|
||||||
|
|
||||||
add_project_executable2(${name} "${dependencies}" "${libraries}" "${headers}" "${sources}")
|
add_project_executable2(${name} "${dependencies}" "${libraries}" "${headers}" "${sources}")
|
||||||
|
Loading…
x
Reference in New Issue
Block a user