cmake: update dependencies in test files

jrfonseca · Apr 24, 2023 · fc05121 · fc05121
1 parent a07674c
commit fc05121
Showing 1 changed file with 3 additions and 19 deletions.
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -8,12 +8,10 @@ force_debug ()
 add_executable (test_mgwhelp
     test_mgwhelp.cpp
 )
-add_dependencies (test_mgwhelp mgwhelp_implib)
 target_link_libraries (test_mgwhelp
-    mgwhelp_implib
+    mgwhelp
     shlwapi
 )
-add_dependencies (check test_mgwhelp)
 add_test (
     NAME test_mgwhelp
     COMMAND test_mgwhelp
@@ -45,7 +43,6 @@ add_custom_target (test_mgwhelp_split ALL
         ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/test_mgwhelp_split.exe
         ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/test_mgwhelp_split.debug
 )
-add_dependencies (check test_mgwhelp_split)
 add_test (
     NAME test_mgwhelp_split
     COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/test_mgwhelp_split.exe
@@ -81,7 +78,6 @@ add_custom_target (test_mgwhelp_split_subdir ALL
         ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/test_mgwhelp_split_subdir.exe
         ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/.debug/test_mgwhelp_split_subdir.debug
 )
-add_dependencies (check test_mgwhelp_split_subdir)
 add_test (
     NAME test_mgwhelp_split_subdir
     COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/test_mgwhelp_split_subdir.exe
@@ -105,7 +101,6 @@ add_custom_target (test_mgwhelp_stripped ALL
     DEPENDS
         ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/test_mgwhelp_stripped.exe
 )
-add_dependencies (check test_mgwhelp_stripped)
 add_test (
     NAME test_mgwhelp_stripped
     COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/test_mgwhelp_stripped.exe
@@ -186,7 +181,6 @@ endif ()
 if (OBJCOPY_VERSION STREQUAL "llvm-objcopy")
     set_target_properties (test_mgwhelp_zdebug PROPERTIES EXCLUDE_FROM_ALL ON)
 else ()
-    add_dependencies (check test_mgwhelp_zdebug)
 endif ()
 if (OBJCOPY_VERSION STREQUAL "llvm-objcopy" OR OBJCOPY_VERSION VERSION_LESS "2.34")
     set_tests_properties (test_mgwhelp_zdebug PROPERTIES DISABLED ON)
@@ -203,9 +197,7 @@ include_directories (
 add_executable (test_exchndl_static_unicode
     test_exchndl_static_unicode.cpp
 )
-add_dependencies (test_exchndl_static_unicode exchndl_implib)
-target_link_libraries (test_exchndl_static_unicode exchndl_implib shlwapi)
-add_dependencies (check test_exchndl_static_unicode)
+target_link_libraries (test_exchndl_static_unicode exchndl shlwapi)
 add_test (
     NAME test_exchndl_static_unicode
     COMMAND test_exchndl_static_unicode
@@ -223,9 +215,7 @@ include_directories (
 add_executable (test_exchndl_static_ansi
     test_exchndl_static_ansi.cpp
 )
-add_dependencies (test_exchndl_static_ansi exchndl_implib)
-target_link_libraries (test_exchndl_static_ansi exchndl_implib shlwapi)
-add_dependencies (check test_exchndl_static_ansi)
+target_link_libraries (test_exchndl_static_ansi exchndl shlwapi)
 add_test (
     NAME test_exchndl_static_ansi
     COMMAND test_exchndl_static_ansi
@@ -244,8 +234,6 @@ add_executable (test_exchndl_dynamic_unicode
     test_exchndl_dynamic_unicode.cpp
 )
 target_link_libraries (test_exchndl_dynamic_unicode shlwapi)
-add_dependencies (test_exchndl_dynamic_unicode exchndl)
-add_dependencies (check test_exchndl_dynamic_unicode)
 add_test (
     NAME test_exchndl_dynamic_unicode
     COMMAND test_exchndl_dynamic_unicode
@@ -264,8 +252,6 @@ add_executable (test_exchndl_dynamic_ansi
     test_exchndl_dynamic_ansi.cpp
 )
 target_link_libraries (test_exchndl_dynamic_ansi shlwapi)
-add_dependencies (test_exchndl_dynamic_ansi exchndl)
-add_dependencies (check test_exchndl_dynamic_ansi)
 add_test (
     NAME test_exchndl_dynamic_ansi
     COMMAND test_exchndl_dynamic_ansi
@@ -280,8 +266,6 @@ add_test (
 add_executable (test_addr2line
     test_addr2line.cpp
 )
-add_dependencies (test_addr2line addr2line)
-add_dependencies (check test_addr2line)
 add_test (
     NAME test_addr2line
     COMMAND test_addr2line