Apple-2-HW/unified_retro_keyboard
1
0
Fork 0
mirror of https://github.com/osiweb/unified_retro_keyboard.git synced 2024-12-29 03:29:20 +00:00
Code Issues Projects Releases Wiki Activity

Fix test/CmakeLists.txt so tests compile.

Browse Source 
Apparently some file pollution resulted in a successful compile that couldn't be
reprodued from a fresh git clone.  Fixed file copying and include paths so
compile works.  All tests pass.
This commit is contained in:
David Fenyes 2021-03-08 12:27:53 -06:00
parent 859a5e03d1
commit 23dd38b488
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
firmware/asdf/test/CmakeLists.txt
View File

@ -1,4 +1,7 @@
temporary_config_file(${ASDF_SRC_DIR}/Keymaps/asdf_all_keymap_defs_test.h ${CMAKE_CURRENT_BINARY_DIR}/asdf_keymap_defs.h) configure_file(${ASDF_SRC_DIR}/Keymaps/asdf_all_keymap_defs_test.h asdf_keymap_defs.h)
configure_file(${ASDF_SRC_DIR}/Arch/asdf_arch_test.c asdf_arch.c)
configure_file(${ASDF_SRC_DIR}/Arch/asdf_arch_test.h asdf_arch.h)
list(APPEND C_FLAGS list(APPEND C_FLAGS
"-std=c99" "-std=c99"
@ -18,10 +21,6 @@ list(APPEND C_FLAGS
) )
list(APPEND TEST_INCLUDES list(APPEND TEST_INCLUDES
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/unity
${ASDF_SRC_DIR}
${ASDF_SRC_DIR}/Arch
) )
add_library(asdf_core add_library(asdf_core
@ -34,13 +33,12 @@ add_library(asdf_core
${ASDF_SRC_DIR}/asdf_physical.c ${ASDF_SRC_DIR}/asdf_physical.c
${ASDF_SRC_DIR}/asdf_repeat.c ${ASDF_SRC_DIR}/asdf_repeat.c
${ASDF_SRC_DIR}/asdf_virtual.c ${ASDF_SRC_DIR}/asdf_virtual.c
${ASDF_SRC_DIR}/Arch/asdf_arch_test.c asdf_arch.c
) )
target_include_directories(asdf_core target_include_directories(asdf_core
PRIVATE PRIVATE
${ASDF_SRC_DIR} ${ASDF_SRC_DIR}
${ASDF_SRC_DIR}/Arch
${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}
) )
@ -54,7 +52,7 @@ target_include_directories(test_helpers
PRIVATE PRIVATE
${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}
${ASDF_SRC_DIR} ${ASDF_SRC_DIR}
${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}
) )
@ -77,7 +75,10 @@ function(setup_test testname)
target_include_directories(${testname} target_include_directories(${testname}
PRIVATE PRIVATE
${TEST_INCLUDES} ${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/unity
${ASDF_SRC_DIR}
${CMAKE_CURRENT_BINARY_DIR}
) )
target_link_libraries(${testname} asdf_core test_helpers) target_link_libraries(${testname} asdf_core test_helpers)