From 8a7a5cc65b47f1cc3a334ae15df947e49893b0e1 Mon Sep 17 00:00:00 2001
From: Fred Hornsey <hornseyf@objectcomputing.com>
Date: Mon, 19 Oct 2020 14:28:26 -0500
Subject: [PATCH] Remove Deprecation in CMake Added for 3.15

---
 cmake/OpenDDSConfig.cmake |  3 ---
 cmake/api_macros.cmake    | 13 -------------
 docs/cmake.md             |  3 ---
 3 files changed, 19 deletions(-)

diff --git a/cmake/OpenDDSConfig.cmake b/cmake/OpenDDSConfig.cmake
index 4f63141d4d..b283df5af3 100644
--- a/cmake/OpenDDSConfig.cmake
+++ b/cmake/OpenDDSConfig.cmake
@@ -60,9 +60,6 @@
 # When IDL sources are supplied, custom commands are generated which will
 # be invoked to compile the IDL sources into their component cpp/h files.
 #
-# NOTE: C/C++ items can also be accepted and added to the target, but passing
-# non-IDL sources was deprecated in OpenDDS 3.15.
-#
 # A custom command will also be added to generate the required IDL export
 # header file (*target*_export.h) to add the required export macros. This
 # file is then added as a dependency for the supplied target.
diff --git a/cmake/api_macros.cmake b/cmake/api_macros.cmake
index 53be03916e..2b2933fbdf 100644
--- a/cmake/api_macros.cmake
+++ b/cmake/api_macros.cmake
@@ -17,7 +17,6 @@ macro(OPENDDS_GET_SOURCES_AND_OPTIONS
   cmake_parse_arguments(_arg "" "" "${_options_n}" ${ARGN})
 
   # Handle explicit sources per scope
-  set(_non_idl_file_warning ON)
   foreach (scope PUBLIC PRIVATE INTERFACE)
     set(${src_prefix}_${scope})
     set(${idl_prefix}_${scope})
@@ -29,12 +28,6 @@ macro(OPENDDS_GET_SOURCES_AND_OPTIONS
         if("${src}" MATCHES "\\.idl$")
           list(APPEND ${idl_prefix}_${scope} ${src})
         else()
-          if(${_non_idl_file_warning})
-            message(DEPRECATION "Passing files that aren't IDL files to "
-              "OPENDDS_TARGET_SOURCES is deprecated")
-            set(_non_idl_file_warning OFF)
-          endif()
-
           list(APPEND ${src_prefix}_${scope} ${src})
         endif()
       endforeach()
@@ -54,12 +47,6 @@ macro(OPENDDS_GET_SOURCES_AND_OPTIONS
       list(APPEND ${idl_prefix}_PRIVATE ${arg})
 
     else()
-      if(${_non_idl_file_warning})
-        message(DEPRECATION "Passing files that aren't IDL files to "
-          "OPENDDS_TARGET_SOURCES is deprecated")
-        set(_non_idl_file_warning OFF)
-      endif()
-
       list(APPEND ${src_prefix}_PRIVATE ${arg})
     endif()
   endforeach()
diff --git a/docs/cmake.md b/docs/cmake.md
index e9e5f95127..d3d7649c9d 100644
--- a/docs/cmake.md
+++ b/docs/cmake.md
@@ -201,9 +201,6 @@ built-in [`target_sources`](https://cmake.org/cmake/help/latest/command/target_s
 When IDL sources are supplied, custom commands are generated which will
 be invoked to compile the IDL sources into their component cpp/h files.
 
-**NOTE:** C/C++ items can also be accepted and added to the target, but passing
-non-IDL sources was deprecated in OpenDDS 3.15.
-
 If the passed-in target is a shared library, a custom command will also be
 added to generate the required IDL export header file (*target*_export.h),
 which is necessary to properly export symbols for the IDL-Generated sources.