diff --git a/CMake/fl_add_library.cmake b/CMake/fl_add_library.cmake
index b0fafbe32..ee7956560 100644
--- a/CMake/fl_add_library.cmake
+++ b/CMake/fl_add_library.cmake
@@ -37,13 +37,13 @@ macro (FL_ADD_LIBRARY LIBNAME LIBTYPE LIBFILES)
 
   add_library(${TARGET_NAME} ${LIBTYPE} ${LIBFILES})
 
-  # target properties for all libraries
+  # Target properties for all libraries
 
-  set_target_properties(${TARGET_NAME}
-    PROPERTIES
-    CLEAN_DIRECT_OUTPUT TRUE
-    COMPILE_DEFINITIONS "FL_LIBRARY"
-  )
+  # Set 'PRIVATE' target compile definitions for the library
+  # so they are not inherited by consumers
+
+  target_compile_definitions(${TARGET_NAME}
+    PRIVATE "FL_LIBRARY")
 
   # additional target properties for static libraries
 
@@ -105,11 +105,9 @@ macro (FL_ADD_LIBRARY LIBNAME LIBTYPE LIBFILES)
     endif (OPTION_LARGE_FILE)
 
     if (${LIBTYPE} STREQUAL "SHARED")
-      set_target_properties(${TARGET_NAME}
-        PROPERTIES
-        COMPILE_DEFINITIONS "FL_DLL"
-      )
-    endif (${LIBTYPE} STREQUAL "SHARED")
+      target_compile_definitions(${TARGET_NAME}
+        PRIVATE "FL_DLL")
+    endif ()
   endif (MSVC)
 
   install (TARGETS ${TARGET_NAME}
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 681aac2cd..9f1a578b8 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -580,8 +580,6 @@ if (WIN32)
   list (APPEND STATIC_FILES fl_call_main.c)
 endif (WIN32)
 
-add_definitions(-DFL_LIBRARY)
-
 #######################################################################
 
 # prepare optional libs for shared and static FLTK libraries