Fixed cmake config for windows test runner

visrealm · Sep 3, 2023 · f0abe80 · f0abe80
1 parent ec572c2
commit f0abe80
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 13 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -7,6 +7,8 @@ option(BUILD_SHARED_LIBS "Build using shared libraries" ON)
 
 project(vrEmu6502)
 
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin/)
+
 if (WIN32)
   if (NOT BUILD_SHARED_LIBS)
      add_definitions(-DVR_6502_EMU_STATIC)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -5,8 +5,6 @@ add_library(vrEmu6502 vrEmu6502.c)
 if (WIN32)
   if (BUILD_SHARED_LIBS)
      add_definitions(-DVR_6502_EMU_COMPILING_DLL)
-   else()
-     add_definitions(-DVR_6502_EMU_STATIC)
    endif()
 endif()
 

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -5,18 +5,19 @@ add_executable (vrEmu6502Test vrEmu6502Test.c)
 target_link_libraries(vrEmu6502Test vrEmu6502)
 
 set(TESTS_DIR ${CMAKE_CURRENT_SOURCE_DIR}/programs/)
+set(TEST_RUNNER ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}vrEmu6502Test)
 
-add_test(6502_functional_test vrEmu6502Test -quiet -cpu 6502 ${TESTS_DIR}6502_functional_test.hex)
-add_test(65c02_functional_test vrEmu6502Test -quiet -cpu 65c02 ${TESTS_DIR}6502_functional_test.hex)
-add_test(w65c02_functional_test vrEmu6502Test -quiet -cpu w65c02 ${TESTS_DIR}6502_functional_test.hex)
-add_test(r65c02_functional_test vrEmu6502Test -quiet -cpu r65c02 ${TESTS_DIR}6502_functional_test.hex)
+add_test(6502_functional_test ${TEST_RUNNER} -quiet -cpu 6502 ${TESTS_DIR}6502_functional_test.hex)
+add_test(65c02_functional_test ${TEST_RUNNER} -quiet -cpu 65c02 ${TESTS_DIR}6502_functional_test.hex)
+add_test(w65c02_functional_test ${TEST_RUNNER} -quiet -cpu w65c02 ${TESTS_DIR}6502_functional_test.hex)
+add_test(r65c02_functional_test ${TEST_RUNNER} -quiet -cpu r65c02 ${TESTS_DIR}6502_functional_test.hex)
 
-add_test(6502_decimal_test vrEmu6502Test -quiet -cpu 6502 ${TESTS_DIR}6502_decimal_test.hex)
-add_test(65c02_decimal_test vrEmu6502Test -quiet -cpu 65c02 ${TESTS_DIR}6502_decimal_test.hex)
-add_test(w65c02_decimal_test vrEmu6502Test -quiet -cpu w65c02 ${TESTS_DIR}6502_decimal_test.hex)
-add_test(r65c02_decimal_test vrEmu6502Test -quiet -cpu r65c02 ${TESTS_DIR}6502_decimal_test.hex)
+add_test(6502_decimal_test ${TEST_RUNNER} -quiet -cpu 6502 ${TESTS_DIR}6502_decimal_test.hex)
+add_test(65c02_decimal_test ${TEST_RUNNER} -quiet -cpu 65c02 ${TESTS_DIR}6502_decimal_test.hex)
+add_test(w65c02_decimal_test ${TEST_RUNNER} -quiet -cpu w65c02 ${TESTS_DIR}6502_decimal_test.hex)
+add_test(r65c02_decimal_test ${TEST_RUNNER} -quiet -cpu r65c02 ${TESTS_DIR}6502_decimal_test.hex)
 
-add_test(65c02_extended_test vrEmu6502Test -quiet -cpu 65c02 ${TESTS_DIR}65C02_extended_opcodes_test.hex)
-add_test(w65c02_extended_test vrEmu6502Test -quiet -cpu w65c02 ${TESTS_DIR}W65C02_extended_opcodes_test.hex)
-add_test(r65c02_extended_test vrEmu6502Test -quiet -cpu r65c02 ${TESTS_DIR}R65C02_extended_opcodes_test.hex)
+add_test(65c02_extended_test ${TEST_RUNNER} -quiet -cpu 65c02 ${TESTS_DIR}65C02_extended_opcodes_test.hex)
+add_test(w65c02_extended_test ${TEST_RUNNER} -quiet -cpu w65c02 ${TESTS_DIR}W65C02_extended_opcodes_test.hex)
+add_test(r65c02_extended_test ${TEST_RUNNER} -quiet -cpu r65c02 ${TESTS_DIR}R65C02_extended_opcodes_test.hex)