Skip to content

Commit

Permalink
Remove Deprecation in CMake Added for 3.15
Browse files Browse the repository at this point in the history
  • Loading branch information
iguessthislldo committed Oct 19, 2020
1 parent ac631bd commit 8a7a5cc
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 19 deletions.
3 changes: 0 additions & 3 deletions cmake/OpenDDSConfig.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
13 changes: 0 additions & 13 deletions cmake/api_macros.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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})
Expand All @@ -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()
Expand All @@ -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()
Expand Down
3 changes: 0 additions & 3 deletions docs/cmake.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down

0 comments on commit 8a7a5cc

Please sign in to comment.