Make the target name configurable (and use "Hatari" for the macOS bundle)

Thanks to Andreas Grabher for the idea!

14 files changed, 71 insertions, 67 deletions

diff --git a/.cirrus.yml b/.cirrus.yml
index 2367fc7..55d0619 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -64,13 +64,13 @@ macos12_task:
     - cd build
     - cmake -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING="10.9" ..
       || { cat config.log; exit 1; }
-    - cmake --build . --verbose --config Release -j$(sysctl -n hw.ncpu) -t hatari
-    - codesign --force -s - --entitlements ../src/gui-osx/hatari.app.xcent src/hatari.app
+    - cmake --build . --verbose --config Release -j$(sysctl -n hw.ncpu) -t Hatari
+    - codesign --force -s - --entitlements ../src/gui-osx/hatari.app.xcent src/Hatari.app
     - cd ..
     - mkdir hatari-snapshot
     - echo $(git rev-parse HEAD) > hatari-snapshot/version.txt
     - date >> hatari-snapshot/version.txt
-    - cp -a build/src/hatari.app hatari-snapshot/
+    - cp -a build/src/Hatari.app hatari-snapshot/
     - cp -a doc gpl.txt readme.txt hatari-snapshot/
     - zip -r hatari-snapshot.zip hatari-snapshot
   hatari_artifacts:
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f62467b..e380a0f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -20,8 +20,6 @@ endif(APPLE AND CMAKE_BUILD_TYPE STREQUAL "Release")
 project(Hatari C)
 enable_testing()
 
-set(APP_NAME "Hatari")
-
 set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
 
 include(CheckIncludeFiles)
@@ -107,6 +105,12 @@ else()
 	    CACHE BOOL "Built Hatari as macOS application bundle")
 endif(APPLE)
 
+if(ENABLE_OSX_BUNDLE OR WIN32)
+	set(APP_NAME "Hatari")
+else()
+	set(APP_NAME "hatari")
+endif(ENABLE_OSX_BUNDLE OR WIN32)
+
 # ####################
 # Check for libraries:
 # ####################
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 30630b6..402491b 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -89,18 +89,18 @@ add_subdirectory(cpu)
 # When building for macOS, add specific sources
 if(ENABLE_OSX_BUNDLE)
 	set_source_files_properties(${FRAMEWORKS} PROPERTIES MACOSX_PACKAGE_LOCATION Frameworks)
-	add_executable(hatari MACOSX_BUNDLE ${GUIOSX_RSRCS} ${GUIOSX_DOCS} ${SOURCES} ${GUIOSX_SOURCES} ${FRAMEWORKS})
-	set_target_properties(hatari PROPERTIES MACOSX_BUNDLE_INFO_PLIST
+	add_executable(${APP_NAME} MACOSX_BUNDLE ${GUIOSX_RSRCS} ${GUIOSX_DOCS} ${SOURCES} ${GUIOSX_SOURCES} ${FRAMEWORKS})
+	set_target_properties(${APP_NAME} PROPERTIES MACOSX_BUNDLE_INFO_PLIST
 			      ${CMAKE_CURRENT_SOURCE_DIR}/gui-osx/Info-Hatari.plist)
-	set_target_properties(hatari PROPERTIES INSTALL_RPATH
+	set_target_properties(${APP_NAME} PROPERTIES INSTALL_RPATH
 			      "@executable_path/../Frameworks")
-	set_target_properties(hatari PROPERTIES BUILD_WITH_INSTALL_RPATH TRUE)
+	set_target_properties(${APP_NAME} PROPERTIES BUILD_WITH_INSTALL_RPATH TRUE)
 	set(MACOSX_BUNDLE_ICON_FILE Hatari.icns)
 	set(MACOSX_BUNDLE_GUI_IDENTIFIER org.tuxfamily.Hatari)
 	if(CMAKE_GENERATOR MATCHES "Xcode")
-		set(BUNDLE_CONTENTS ${CMAKE_CURRENT_BINARY_DIR}/\${CONFIGURATION}/Hatari.app/Contents)
+		set(BUNDLE_CONTENTS ${CMAKE_CURRENT_BINARY_DIR}/\${CONFIGURATION}/${APP_NAME}.app/Contents)
 	else()
-		set(BUNDLE_CONTENTS ${CMAKE_CURRENT_BINARY_DIR}/Hatari.app/Contents)
+		set(BUNDLE_CONTENTS ${CMAKE_CURRENT_BINARY_DIR}/${APP_NAME}.app/Contents)
 	endif()
 	if(PNG_FOUND)
 		set(COPY_PNG cp -R ${PNG_LIBRARY} ${BUNDLE_CONTENTS}/Frameworks/)
@@ -122,7 +122,7 @@ if(ENABLE_OSX_BUNDLE)
 			COMMAND cp -R ${SDL2_LIBDIR} ${BUNDLE_CONTENTS}/Frameworks/
 			COMMAND ${COPY_PNG}
 	)
-	add_dependencies(hatari osx_bundle_dirs)
+	add_dependencies(${APP_NAME} osx_bundle_dirs)
 	set_source_files_properties(${GUIOSX_RSRCS} PROPERTIES
 				    MACOSX_PACKAGE_LOCATION Resources)
 	set_source_files_properties(${GUIOSX_DOCS} PROPERTIES
@@ -137,7 +137,7 @@ if(ENABLE_OSX_BUNDLE)
 	endif()
 	# Compile the .xib files using the 'ibtool' program with the destination being the app package
 	foreach(xib ${HATARI_XIBS})
-		add_custom_command (TARGET hatari POST_BUILD
+		add_custom_command (TARGET ${APP_NAME} POST_BUILD
 			COMMAND ${IBTOOL} --errors --warnings --notices --output-format human-readable-text
 				--compile ${BUNDLE_CONTENTS}/Resources/${xib}.nib ${CMAKE_CURRENT_SOURCE_DIR}/gui-osx/${xib}.xib
 			COMMAND rm ${BUNDLE_CONTENTS}/Resources/${xib}.xib
@@ -153,13 +153,13 @@ elseif(WIN32)
 	ENABLE_LANGUAGE(RC)
 	set(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> <FLAGS> -Ocoff -o <OBJECT> <SOURCE>")
 	set_source_files_properties(${GUIWIN_RES} PROPERTIES LANGUAGE RC)
-	add_executable(hatari ${GUIWIN_RES} ${SOURCES} ${GUIWIN_SOURCES})
+	add_executable(${APP_NAME} ${GUIWIN_RES} ${SOURCES} ${GUIWIN_SOURCES})
 
 #emscripten needs some em-specific linker flags
 elseif(EMSCRIPTEN)
-	add_executable(hatari ${SOURCES})
+	add_executable(${APP_NAME} ${SOURCES})
 	set_target_properties(
-		hatari
+		${APP_NAME}
 		PROPERTIES
 		LINK_FLAGS
 		"-O3 \
@@ -173,66 +173,66 @@ elseif(EMSCRIPTEN)
 	)
 # Other targets, use default sources
 else()
-	add_executable(hatari ${SOURCES})
+	add_executable(${APP_NAME} ${SOURCES})
 endif(ENABLE_OSX_BUNDLE)
 
 if(SDL2_OTHER_CFLAGS)
-	target_compile_definitions(hatari PRIVATE ${SDL2_OTHER_CFLAGS})
+	target_compile_definitions(${APP_NAME} PRIVATE ${SDL2_OTHER_CFLAGS})
 	# message(STATUS "Additional CFLAGS of SDL: ${SDL2_OTHER_CFLAGS}")
 endif(SDL2_OTHER_CFLAGS)
 
-target_link_libraries(hatari Falcon UaeCpu GuiSdl Floppy Debug ${SDL2_LIBRARIES})
+target_link_libraries(${APP_NAME} Falcon UaeCpu GuiSdl Floppy Debug ${SDL2_LIBRARIES})
 
 if(Math_FOUND AND NOT APPLE)
-	target_link_libraries(hatari ${MATH_LIBRARY})
+	target_link_libraries(${APP_NAME} ${MATH_LIBRARY})
 endif()
 
 if(Readline_FOUND)
-	target_link_libraries(hatari ${READLINE_LIBRARY})
+	target_link_libraries(${APP_NAME} ${READLINE_LIBRARY})
 endif(Readline_FOUND)
 
 if(ZLIB_FOUND)
-	target_link_libraries(hatari ${ZLIB_LIBRARY})
+	target_link_libraries(${APP_NAME} ${ZLIB_LIBRARY})
 endif(ZLIB_FOUND)
 
 if(PNG_FOUND)
-	target_link_libraries(hatari ${PNG_LIBRARY})
+	target_link_libraries(${APP_NAME} ${PNG_LIBRARY})
 endif(PNG_FOUND)
 
 if(X11_FOUND)
-	target_link_libraries(hatari ${X11_LIBRARIES})
+	target_link_libraries(${APP_NAME} ${X11_LIBRARIES})
 endif(X11_FOUND)
 
 if(PortMidi_FOUND)
-	target_link_libraries(hatari ${PORTMIDI_LIBRARY})
+	target_link_libraries(${APP_NAME} ${PORTMIDI_LIBRARY})
 endif(PortMidi_FOUND)
 
 if(CapsImage_FOUND)
-	target_link_libraries(hatari ${CAPSIMAGE_LIBRARY})
+	target_link_libraries(${APP_NAME} ${CAPSIMAGE_LIBRARY})
 endif(CapsImage_FOUND)
 
 if(Udev_FOUND)
-	target_link_libraries(hatari ${UDEV_LIBRARY})
+	target_link_libraries(${APP_NAME} ${UDEV_LIBRARY})
 endif(Udev_FOUND)
 
 if(Capstone_FOUND)
-	target_link_libraries(hatari ${CAPSTONE_LIBRARY})
+	target_link_libraries(${APP_NAME} ${CAPSTONE_LIBRARY})
 endif(Capstone_FOUND)
 
 if(APPLE)
-	target_link_libraries(hatari "-framework Cocoa")
+	target_link_libraries(${APP_NAME} "-framework Cocoa")
 endif()
 
 if(WIN32)
 	# Needed for socket() on Windows
-	target_link_libraries(hatari ws2_32)
+	target_link_libraries(${APP_NAME} ws2_32)
 endif(WIN32)
 
 
 if(ENABLE_OSX_BUNDLE)
-	install(TARGETS hatari BUNDLE DESTINATION /Applications)
+	install(TARGETS ${APP_NAME} BUNDLE DESTINATION /Applications)
 else()
-	install(TARGETS hatari RUNTIME DESTINATION ${BINDIR})
+	install(TARGETS ${APP_NAME} RUNTIME DESTINATION ${BINDIR})
 	install(FILES hatari-icon.bmp DESTINATION ${DATADIR})
 	file(GLOB TOS_IMG_FILE tos.img)
 	if(TOS_IMG_FILE)
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 9a92ff0..07f4b9d 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -4,9 +4,9 @@ add_subdirectory(unit)
 
 if(UNIX)
 	add_test(NAME command-fifo COMMAND
-	         ${CMAKE_CURRENT_SOURCE_DIR}/cmdfifo.sh $<TARGET_FILE:hatari>)
+	         ${CMAKE_CURRENT_SOURCE_DIR}/cmdfifo.sh $<TARGET_FILE:${APP_NAME}>)
 	add_test(NAME config-file COMMAND
-	         ${CMAKE_CURRENT_SOURCE_DIR}/configfile.sh $<TARGET_FILE:hatari>)
+	         ${CMAKE_CURRENT_SOURCE_DIR}/configfile.sh $<TARGET_FILE:${APP_NAME}>)
 	add_subdirectory(blitter)
 	add_subdirectory(buserror)
 	add_subdirectory(cpu)
diff --git a/tests/blitter/CMakeLists.txt b/tests/blitter/CMakeLists.txt
index 4649cb0..31fd19b 100644
--- a/tests/blitter/CMakeLists.txt
+++ b/tests/blitter/CMakeLists.txt
@@ -2,4 +2,4 @@
 set(testrunner ${CMAKE_CURRENT_SOURCE_DIR}/run_test.sh)
 
 add_test(NAME blitter
-          COMMAND ${testrunner} $<TARGET_FILE:hatari> --machine ste)
+          COMMAND ${testrunner} $<TARGET_FILE:${APP_NAME}> --machine ste)
diff --git a/tests/buserror/CMakeLists.txt b/tests/buserror/CMakeLists.txt
index 22f3d42..53c9c2b 100644
--- a/tests/buserror/CMakeLists.txt
+++ b/tests/buserror/CMakeLists.txt
@@ -2,24 +2,24 @@
 set(testrunner ${CMAKE_CURRENT_SOURCE_DIR}/run_test.sh)
 
 foreach(machine st megast ste megaste tt falcon)
- add_test(NAME buserror-${machine}-b COMMAND ${testrunner} $<TARGET_FILE:hatari> b ${machine})
- add_test(NAME buserror-${machine}-w COMMAND ${testrunner} $<TARGET_FILE:hatari> w ${machine})
+ add_test(NAME buserror-${machine}-b COMMAND ${testrunner} $<TARGET_FILE:${APP_NAME}> b ${machine})
+ add_test(NAME buserror-${machine}-w COMMAND ${testrunner} $<TARGET_FILE:${APP_NAME}> w ${machine})
 endforeach(machine)
 
 foreach (lvl RANGE 0 4)
   add_test(NAME buserror-680${lvl}0-fast
-           COMMAND ${testrunner} $<TARGET_FILE:hatari> w st --cpulevel ${lvl} --compatible false --cpu-exact false)
+           COMMAND ${testrunner} $<TARGET_FILE:${APP_NAME}> w st --cpulevel ${lvl} --compatible false --cpu-exact false)
   add_test(NAME buserror-680${lvl}0-compatible
-           COMMAND ${testrunner} $<TARGET_FILE:hatari> w st --cpulevel ${lvl} --compatible true --cpu-exact false)
+           COMMAND ${testrunner} $<TARGET_FILE:${APP_NAME}> w st --cpulevel ${lvl} --compatible true --cpu-exact false)
   add_test(NAME buserror-680${lvl}0-cpuexact
-           COMMAND ${testrunner} $<TARGET_FILE:hatari> w st --cpulevel ${lvl} --compatible false --cpu-exact true)
+           COMMAND ${testrunner} $<TARGET_FILE:${APP_NAME}> w st --cpulevel ${lvl} --compatible false --cpu-exact true)
   if (${lvl} GREATER 2)
   add_test(NAME buserror-680${lvl}0-mmu
-           COMMAND ${testrunner} $<TARGET_FILE:hatari> w tt --cpulevel ${lvl} --mmu true)
+           COMMAND ${testrunner} $<TARGET_FILE:${APP_NAME}> w tt --cpulevel ${lvl} --mmu true)
   endif()
 endforeach(lvl)
 
 add_test(NAME buserror-68060
-         COMMAND ${testrunner} $<TARGET_FILE:hatari> w tt --cpulevel 6 --mmu false)
+         COMMAND ${testrunner} $<TARGET_FILE:${APP_NAME}> w tt --cpulevel 6 --mmu false)
 add_test(NAME buserror-68060-mmu
-         COMMAND ${testrunner} $<TARGET_FILE:hatari> w tt --cpulevel 6 --mmu true)
+         COMMAND ${testrunner} $<TARGET_FILE:${APP_NAME}> w tt --cpulevel 6 --mmu true)
diff --git a/tests/cpu/CMakeLists.txt b/tests/cpu/CMakeLists.txt
index f3856e9..fa50719 100644
--- a/tests/cpu/CMakeLists.txt
+++ b/tests/cpu/CMakeLists.txt
@@ -3,6 +3,6 @@ set(testrunner ${CMAKE_CURRENT_SOURCE_DIR}/run_test.sh)
 
 foreach (lvl 0 3 4)
  add_test(NAME cpu-integer-680${lvl}0
-          COMMAND ${testrunner} $<TARGET_FILE:hatari>
+          COMMAND ${testrunner} $<TARGET_FILE:${APP_NAME}>
                   ${CMAKE_CURRENT_SOURCE_DIR}/int_test.tos --cpulevel ${lvl})
 endforeach(lvl)
diff --git a/tests/cycles/CMakeLists.txt b/tests/cycles/CMakeLists.txt
index 7b634be..6b6e43d 100644
--- a/tests/cycles/CMakeLists.txt
+++ b/tests/cycles/CMakeLists.txt
@@ -2,6 +2,6 @@
 set(testrunner ${CMAKE_CURRENT_SOURCE_DIR}/run_test.sh)
 
 add_test(NAME cycles-exact
-         COMMAND ${testrunner} $<TARGET_FILE:hatari> --compatible false --cpu-exact true)
+         COMMAND ${testrunner} $<TARGET_FILE:${APP_NAME}> --compatible false --cpu-exact true)
 add_test(NAME cycles-compatible
-         COMMAND ${testrunner} $<TARGET_FILE:hatari> --compatible true --cpu-exact false)
+         COMMAND ${testrunner} $<TARGET_FILE:${APP_NAME}> --compatible true --cpu-exact false)
diff --git a/tests/gemdos/CMakeLists.txt b/tests/gemdos/CMakeLists.txt
index 81c96a9..4cc1af8 100644
--- a/tests/gemdos/CMakeLists.txt
+++ b/tests/gemdos/CMakeLists.txt
@@ -2,5 +2,5 @@
 set(testrunner ${CMAKE_CURRENT_SOURCE_DIR}/run_test.sh)
 
 add_test(NAME gemdos
-         COMMAND ${testrunner} $<TARGET_FILE:hatari>
+         COMMAND ${testrunner} $<TARGET_FILE:${APP_NAME}>
                  ${CMAKE_CURRENT_SOURCE_DIR}/gmdostst.tos)
diff --git a/tests/mem_end/CMakeLists.txt b/tests/mem_end/CMakeLists.txt
index d1aa6d8..4e6446c 100644
--- a/tests/mem_end/CMakeLists.txt
+++ b/tests/mem_end/CMakeLists.txt
@@ -4,17 +4,17 @@ set(scr_runner ${CMAKE_CURRENT_SOURCE_DIR}/scr_run_test.sh)
 foreach(machine st ste tt falcon)
 
   add_test(NAME screen-end-${machine}-color
-           COMMAND ${scr_runner} $<TARGET_FILE:hatari>
+           COMMAND ${scr_runner} $<TARGET_FILE:${APP_NAME}>
                    ${CMAKE_CURRENT_SOURCE_DIR}/scr_end.prg
                        --machine ${machine})
 
   add_test(NAME screen-end-${machine}-mono
-           COMMAND ${scr_runner} $<TARGET_FILE:hatari>
+           COMMAND ${scr_runner} $<TARGET_FILE:${APP_NAME}>
                    ${CMAKE_CURRENT_SOURCE_DIR}/scr_end.prg
                        --machine ${machine} --mono)
 
   add_test(NAME screen-end-${machine}-vdi
-           COMMAND ${scr_runner} $<TARGET_FILE:hatari>
+           COMMAND ${scr_runner} $<TARGET_FILE:${APP_NAME}>
                    ${CMAKE_CURRENT_SOURCE_DIR}/scr_end.prg
                        --machine ${machine} --vdi on)
 
@@ -24,11 +24,11 @@ endforeach(machine)
 set(dsnd_runner ${CMAKE_CURRENT_SOURCE_DIR}/dsnd_run_test.sh)
 
 add_test(NAME dma-sound-end-ste
-         COMMAND ${dsnd_runner} $<TARGET_FILE:hatari>
+         COMMAND ${dsnd_runner} $<TARGET_FILE:${APP_NAME}>
                  ${CMAKE_CURRENT_SOURCE_DIR}/dsnd_end.prg
                      --machine ste)
 
 add_test(NAME dma-sound-end-falcon
-         COMMAND ${dsnd_runner} $<TARGET_FILE:hatari>
+         COMMAND ${dsnd_runner} $<TARGET_FILE:${APP_NAME}>
                  ${CMAKE_CURRENT_SOURCE_DIR}/dsnd_end.prg
                      --machine falcon --cpuclock 8)
diff --git a/tests/natfeats/CMakeLists.txt b/tests/natfeats/CMakeLists.txt
index 15810ee..5f13e58 100644
--- a/tests/natfeats/CMakeLists.txt
+++ b/tests/natfeats/CMakeLists.txt
@@ -3,18 +3,18 @@ set(testrunner ${CMAKE_CURRENT_SOURCE_DIR}/run_test.sh)
 
 foreach (lvl RANGE 0 4)
   add_test(NAME natfeats-680${lvl}0-fast
-           COMMAND ${testrunner} $<TARGET_FILE:hatari> --cpulevel ${lvl} --compatible false --cpu-exact false)
+           COMMAND ${testrunner} $<TARGET_FILE:${APP_NAME}> --cpulevel ${lvl} --compatible false --cpu-exact false)
   add_test(NAME natfeats-680${lvl}0-compatible
-           COMMAND ${testrunner} $<TARGET_FILE:hatari> --cpulevel ${lvl} --compatible true --cpu-exact false)
+           COMMAND ${testrunner} $<TARGET_FILE:${APP_NAME}> --cpulevel ${lvl} --compatible true --cpu-exact false)
   add_test(NAME natfeats-680${lvl}0-cpuexact
-           COMMAND ${testrunner} $<TARGET_FILE:hatari> --cpulevel ${lvl} --compatible false --cpu-exact true)
+           COMMAND ${testrunner} $<TARGET_FILE:${APP_NAME}> --cpulevel ${lvl} --compatible false --cpu-exact true)
   if (${lvl} GREATER 2)
   add_test(NAME natfeats-680${lvl}0-mmu
-           COMMAND ${testrunner} $<TARGET_FILE:hatari> --cpulevel ${lvl} --mmu true)
+           COMMAND ${testrunner} $<TARGET_FILE:${APP_NAME}> --cpulevel ${lvl} --mmu true)
   endif()
 endforeach(lvl)
 
 add_test(NAME natfeats-68060
-         COMMAND ${testrunner} $<TARGET_FILE:hatari> --cpulevel 6 --mmu false)
+         COMMAND ${testrunner} $<TARGET_FILE:${APP_NAME}> --cpulevel 6 --mmu false)
 add_test(NAME natfeats-68060-mmu
-         COMMAND ${testrunner} $<TARGET_FILE:hatari> --cpulevel 6 --mmu true)
+         COMMAND ${testrunner} $<TARGET_FILE:${APP_NAME}> --cpulevel 6 --mmu true)
diff --git a/tests/screen/CMakeLists.txt b/tests/screen/CMakeLists.txt
index 0d16086..81a8a78 100644
--- a/tests/screen/CMakeLists.txt
+++ b/tests/screen/CMakeLists.txt
@@ -7,12 +7,12 @@ find_program(IDENTIFY identify)
 if(GM OR IDENTIFY)
 
   add_test(NAME screen-fullscreen-st
-           COMMAND ${testrunner} $<TARGET_FILE:hatari>
+           COMMAND ${testrunner} $<TARGET_FILE:${APP_NAME}>
                    ${CMAKE_CURRENT_SOURCE_DIR}/flixfull.prg
                    ${CMAKE_CURRENT_SOURCE_DIR}/flix_st.png --machine st)
 
   add_test(NAME screen-fullscreen-ste
-           COMMAND ${testrunner} $<TARGET_FILE:hatari>
+           COMMAND ${testrunner} $<TARGET_FILE:${APP_NAME}>
                    ${CMAKE_CURRENT_SOURCE_DIR}/flixfull.prg
                    ${CMAKE_CURRENT_SOURCE_DIR}/flix_ste.png --machine ste)
 
diff --git a/tests/serial/CMakeLists.txt b/tests/serial/CMakeLists.txt
index 71240f7..7fb0106 100644
--- a/tests/serial/CMakeLists.txt
+++ b/tests/serial/CMakeLists.txt
@@ -3,17 +3,17 @@ set(testrunner ${CMAKE_CURRENT_SOURCE_DIR}/run_test.sh)
 
 foreach(machine st ste tt)
     add_test(NAME serial-mfp-${machine}
-             COMMAND ${testrunner} $<TARGET_FILE:hatari> mfp ${machine})
+             COMMAND ${testrunner} $<TARGET_FILE:${APP_NAME}> mfp ${machine})
 endforeach(machine)
 
 foreach(machine megaste tt falcon)
     add_test(NAME serial-scc-${machine}
-             COMMAND ${testrunner} $<TARGET_FILE:hatari> scc ${machine})
+             COMMAND ${testrunner} $<TARGET_FILE:${APP_NAME}> scc ${machine})
 endforeach(machine)
 
 if(NOT PORTMIDI_FOUND)
     foreach(machine st ste tt falcon)
         add_test(NAME serial-midi-${machine}
-                 COMMAND ${testrunner} $<TARGET_FILE:hatari> midi ${machine})
+                 COMMAND ${testrunner} $<TARGET_FILE:${APP_NAME}> midi ${machine})
     endforeach(machine)
 endif(NOT PORTMIDI_FOUND)
diff --git a/tests/xbios/CMakeLists.txt b/tests/xbios/CMakeLists.txt
index 3d9d774..afa9794 100644
--- a/tests/xbios/CMakeLists.txt
+++ b/tests/xbios/CMakeLists.txt
@@ -3,12 +3,12 @@ set(testrunner ${CMAKE_CURRENT_SOURCE_DIR}/run_test.sh)
 
 foreach (lvl RANGE 0 4)
  add_test(NAME xbios-680${lvl}0
-          COMMAND ${testrunner} $<TARGET_FILE:hatari> --cpulevel ${lvl})
+          COMMAND ${testrunner} $<TARGET_FILE:${APP_NAME}> --cpulevel ${lvl})
 endforeach(lvl)
 
 add_test(NAME xbios-68030-mmu
-         COMMAND ${testrunner} $<TARGET_FILE:hatari> --cpulevel 3 --mmu true)
+         COMMAND ${testrunner} $<TARGET_FILE:${APP_NAME}> --cpulevel 3 --mmu true)
 add_test(NAME xbios-68060
-         COMMAND ${testrunner} $<TARGET_FILE:hatari> --cpulevel 6 --mmu false)
+         COMMAND ${testrunner} $<TARGET_FILE:${APP_NAME}> --cpulevel 6 --mmu false)
 add_test(NAME xbios-68060-mmu
-         COMMAND ${testrunner} $<TARGET_FILE:hatari> --cpulevel 6 --mmu true)
+         COMMAND ${testrunner} $<TARGET_FILE:${APP_NAME}> --cpulevel 6 --mmu true)