diff --git a/cmake/Modules/FindCImg.cmake b/cmake/Modules/FindCImg.cmake
index 09e7fe86..3ea46d0c 100644
--- a/cmake/Modules/FindCImg.cmake
+++ b/cmake/Modules/FindCImg.cmake
@@ -59,16 +59,14 @@ else()
     set(PNG_INCLUDE_DIR ${libpng_INCLUDE_DIRS})
     set(JPEG_INCLUDE_DIR ${libjpeg_INCLUDE_DIRS})
 
-    if(STATIC_BUILD)
-        set(PNG_LIBRARY ${libpng_STATIC_LIBRARIES})
-        set(JPEG_LIBRARIES ${libjpeg_STATIC_LIBRARIES})
-    else()
-        set(PNG_LIBRARY ${libpng_LINK_LIBRARIES})
-        set(JPEG_LIBRARIES ${libjpeg_LINK_LIBRARIES})
-    endif()
+    set(PNG_STATIC_LIBRARY ${libpng_STATIC_LIBRARIES})
+    set(JPEG_STATIC_LIBRARIES ${libjpeg_STATIC_LIBRARIES})
+    set(PNG_LIBRARY ${libpng_LINK_LIBRARIES})
+    set(JPEG_LIBRARIES ${libjpeg_LINK_LIBRARIES})
 
     set(CImg_INCLUDE_DIR ${CIMG_H_DIR} CACHE STRING "")
     set(CImg_INCLUDE_DIRS ${CImg_INCLUDE_DIR})
+    set(CImg_STATIC_LIBRARIES "${PNG_STATIC_LIBRARY};${JPEG_STATIC_LIBRARIES}")
     set(CImg_LIBRARIES "${PNG_LIBRARY};${JPEG_LIBRARIES}")
     set(CImg_DEFINITIONS "cimg_display=0;cimg_use_png=1;cimg_use_jpeg=1")
 
@@ -84,6 +82,12 @@ else()
         set_property(TARGET CImg PROPERTY INTERFACE_LINK_LIBRARIES "${CImg_LIBRARIES}")
         set_property(TARGET CImg PROPERTY INTERFACE_COMPILE_DEFINITIONS "${CImg_DEFINITIONS}")
     endif()
+    if(NOT TARGET CImgStatic)
+        add_library(CImgStatic INTERFACE)
+        set_property(TARGET CImgStatic PROPERTY INTERFACE_INCLUDE_DIRECTORIES "${CIMG_H_DIR};${PNG_INCLUDE_DIR};${JPEG_INCLUDE_DIR}")
+        set_property(TARGET CImgStatic PROPERTY INTERFACE_LINK_LIBRARIES "${CImg_STATIC_LIBRARIES}")
+        set_property(TARGET CImgStatic PROPERTY INTERFACE_COMPILE_DEFINITIONS "${CImg_DEFINITIONS}")
+    endif()
 endif()
 
 include(FindPackageHandleStandardArgs)
diff --git a/tests/simple_library/CMakeLists.txt b/tests/simple_library/CMakeLists.txt
index 7088b3ae..a2109577 100644
--- a/tests/simple_library/CMakeLists.txt
+++ b/tests/simple_library/CMakeLists.txt
@@ -23,5 +23,5 @@ add_custom_target(simple_library_stripped ALL DEPENDS libsimple_library.so.strip
 
 # add a static version, too
 add_library(simple_library_static STATIC simple_library.cpp simple_library.h)
-target_link_libraries(simple_library_static PUBLIC CImg)
+target_link_libraries(simple_library_static PUBLIC CImgStatic)
 target_include_directories(simple_library_static PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})