mirror of
https://github.com/osiweb/unified_retro_keyboard.git
synced 2025-01-02 14:32:20 +00:00
Get tests to pass with CMake build system
progress on issues #23 (new mechanism to add keymaps) and #27 (Cmake build)
This commit is contained in:
parent
a95a8ddb8d
commit
3a854d97f2
@ -31,7 +31,6 @@
|
|||||||
#include "asdf_config.h"
|
#include "asdf_config.h"
|
||||||
#include "asdf_physical.h"
|
#include "asdf_physical.h"
|
||||||
#include "asdf_virtual.h"
|
#include "asdf_virtual.h"
|
||||||
#include "asdf_arch.h"
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
@ -1,4 +1,5 @@
|
|||||||
temporary_config_file(${ASDF_SRC_DIR}/Keymaps/asdf_all_keymap_defs_test.h ${CMAKE_CURRENT_BINARY_DIR}/asdf_keymap_defs.h)
|
temporary_config_file(${ASDF_SRC_DIR}/Keymaps/asdf_all_keymap_defs_test.h ${CMAKE_CURRENT_BINARY_DIR}/asdf_keymap_defs.h)
|
||||||
|
temporary_config_file(${ASDF_SRC_DIR}/Arch/asdf_arch_test.h ${CMAKE_CURRENT_BINARY_DIR}/asdf_arch.h)
|
||||||
|
|
||||||
list(APPEND C_FLAGS
|
list(APPEND C_FLAGS
|
||||||
"-std=c99"
|
"-std=c99"
|
||||||
@ -48,13 +49,14 @@ target_include_directories(asdf_core
|
|||||||
add_library(test_helpers
|
add_library(test_helpers
|
||||||
STATIC
|
STATIC
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/test_asdf_lib.c
|
${CMAKE_CURRENT_SOURCE_DIR}/test_asdf_lib.c
|
||||||
|
${CMAKE_CURRENT_SOURCE_DIR}/test_asdf_keymap_defs.c
|
||||||
)
|
)
|
||||||
|
|
||||||
target_include_directories(test_helpers
|
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}
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
|
@ -4,7 +4,7 @@
|
|||||||
|
|
||||||
#include "unity.h"
|
#include "unity.h"
|
||||||
#include "asdf.h"
|
#include "asdf.h"
|
||||||
#include "asdf_arch.h"
|
#include "asdf_arch_test.h"
|
||||||
#include "asdf_ascii.h"
|
#include "asdf_ascii.h"
|
||||||
#include "asdf_modifiers.h"
|
#include "asdf_modifiers.h"
|
||||||
#include "asdf_keymaps.h"
|
#include "asdf_keymaps.h"
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
#include <stdint.h>
|
#include <stdint.h>
|
||||||
#include <stdarg.h>
|
#include <stdarg.h>
|
||||||
#include "asdf_arch.h"
|
#include "asdf_arch_test.h"
|
||||||
#include "unity.h"
|
#include "unity.h"
|
||||||
#include "asdf.h"
|
#include "asdf.h"
|
||||||
#include "asdf_ascii.h"
|
#include "asdf_ascii.h"
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
#include <stdint.h>
|
#include <stdint.h>
|
||||||
#include <stdarg.h>
|
#include <stdarg.h>
|
||||||
#include "asdf_arch.h"
|
#include "asdf_arch_test.h"
|
||||||
#include "unity.h"
|
#include "unity.h"
|
||||||
#include "asdf.h"
|
#include "asdf.h"
|
||||||
#include "asdf_ascii.h"
|
#include "asdf_ascii.h"
|
||||||
|
Loading…
Reference in New Issue
Block a user