diff --git a/CMake/export.cmake b/CMake/export.cmake
index a466e37ae..220e6dc2c 100644
--- a/CMake/export.cmake
+++ b/CMake/export.cmake
@@ -59,9 +59,22 @@ if(0) # Debug
   message(STATUS "##############################################################")
 endif()
 
+# set fltk-options export names (built or not, Windows)
+if(FLTK_BUILD_FLTK_OPTIONS)
+  set(FLTK_OPTIONS_EXPORT fltk-options)
+  if(WIN32)
+    list(APPEND FLTK_OPTIONS_EXPORT fltk-options-cmd)
+  endif()
+else()
+  set(FLTK_OPTIONS_EXPORT)
+endif()
+
 # generate FLTK-Targets.cmake for build directory use
 export(TARGETS
-          ${FLUID_EXPORT} ${FLTK_LIBRARIES}
+          ${FLTK_LIBRARIES}
+          ${FLTK_LIBRARIES_SHARED}
+          ${FLUID_EXPORT}
+          ${FLTK_OPTIONS_EXPORT}
        FILE
           ${CMAKE_CURRENT_BINARY_DIR}/FLTK-Targets.cmake
        NAMESPACE
diff --git a/fltk-options/CMakeLists.txt b/fltk-options/CMakeLists.txt
index 5ce9e40fb..d48eb5f23 100644
--- a/fltk-options/CMakeLists.txt
+++ b/fltk-options/CMakeLists.txt
@@ -45,6 +45,7 @@ else()
 endif()
 
 target_link_libraries(fltk-options PRIVATE fltk::fltk)
+set_target_properties(fltk-options PROPERTIES EXPORT_NAME options)
 
 # Add the console app (Windows only)
 # This is done for all Windows targets, even if cross-compiling.
@@ -53,6 +54,7 @@ if(WIN32)
   list(APPEND TARGETS fltk-options-cmd)
   add_executable(fltk-options-cmd fltk-options.cxx)
   target_link_libraries(fltk-options-cmd PRIVATE fltk::fltk)
+  set_target_properties(fltk-options-cmd PROPERTIES EXPORT_NAME options-cmd)
 endif()
 
 # Create aliases for all executables,