remove find_library ? just force-link and hope for the best?

davisking · Feb 18, 2024 · fa3e00d · fa3e00d
1 parent b46be21
commit fa3e00d
Showing 1 changed file with 9 additions and 16 deletions.
diff --git a/dlib/cmake/FindGUI.cmake b/dlib/cmake/FindGUI.cmake
@@ -1,22 +1,15 @@
 include(FindPackageHandleStandardArgs)
 
 if (WIN32 AND NOT CYGWIN)
-    find_library(GDI32_LIBRARY NAMES gdi32)
-    find_library(IMM32_LIBRARY NAMES imm32)
-    find_library(COMM_LIBRARY  NAMES comctl32)
-    mark_as_advanced(GDI32_LIBRARY IMM32_LIBRARY COMM_LIBRARY)
-
-    if (GDI32_LIBRARY AND IMM32_LIBRARY AND COMM_LIBRARY)
-        set(GUI_LIBRARIES ${COMM_LIBRARY} ${GDI32_LIBRARY} ${IMM32_LIBRARY})
-        add_library(gui::gdi32 UNKNOWN IMPORTED)
-        set_target_properties(gui::gdi32 PROPERTIES IMPORTED_LOCATION ${GDI32_LIBRARY})
-        add_library(gui::imm32 UNKNOWN IMPORTED)
-        set_target_properties(gui::imm32 PROPERTIES IMPORTED_LOCATION ${IMM32_LIBRARY})
-        add_library(gui::comm UNKNOWN IMPORTED)
-        set_target_properties(gui::comm PROPERTIES IMPORTED_LOCATION ${COMM_LIBRARY})
-        add_library(gui::gui INTERFACE IMPORTED)
-        target_link_libraries(gui::gui INTERFACE gui::comm gui::gdi32 gui::imm32)
-    endif()
+    set(GUI_LIBRARIES comctl32 gdi32 imm32)
+    add_library(gui::gdi32 UNKNOWN IMPORTED)
+    set_target_properties(gui::gdi32 PROPERTIES IMPORTED_LOCATION gdi32)
+    add_library(gui::imm32 UNKNOWN IMPORTED)
+    set_target_properties(gui::imm32 PROPERTIES IMPORTED_LOCATION imm32)
+    add_library(gui::comm UNKNOWN IMPORTED)
+    set_target_properties(gui::comm PROPERTIES IMPORTED_LOCATION comctl32)
+    add_library(gui::gui INTERFACE IMPORTED)
+    target_link_libraries(gui::gui INTERFACE gui::comm gui::gdi32 gui::imm32)
 else()
     find_package(X11)