From 534bda080f9f0886c7325e8b0bd0f1b4639863b4 Mon Sep 17 00:00:00 2001 From: Douglas Ayers Date: Fri, 23 Feb 2024 15:34:42 -0500 Subject: [PATCH 1/2] Removed OPENDDS_FILENAME_ONLY_INCLUDES setting which is deprecated. --- idl2library.cmake | 4 +--- openddw-config.in.cmake | 1 - 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/idl2library.cmake b/idl2library.cmake index 6bdb4d3..99b5b6c 100644 --- a/idl2library.cmake +++ b/idl2library.cmake @@ -73,9 +73,6 @@ function(idl2library) option(OPENDDS_CPP11_IDL_MAPPING "Use C++11 IDL mapping" OFF) option(OPENDDS_CMAKE_VERBOSE "Print verbose output when loading the OpenDDS Config Package" ON) - #This is an option, but we set it as a forced cache var here because otherwise if you include OpenDDS before OpenDDSManager it will default off.. - set(OPENDDS_FILENAME_ONLY_INCLUDES ON CACHE BOOL "No directory info in generated #includes." FORCE) - find_package(OpenDDS REQUIRED) if(NOT IDL_WISHLIST) @@ -185,6 +182,7 @@ function(idl2library) ${${current_idl_target}_RELPATH} OPENDDS_IDL_OPTIONS ${current_idl_include_opts} TAO_IDL_OPTIONS ${current_idl_include_opts} + INCLUDE_BASE ${${current_idl_target}_ABSDIR} ) target_link_libraries(${current_idl_target} ${IDL_TARGET_DEPENDENCIES} diff --git a/openddw-config.in.cmake b/openddw-config.in.cmake index 344c192..9c341bd 100644 --- a/openddw-config.in.cmake +++ b/openddw-config.in.cmake @@ -9,7 +9,6 @@ include(CMakeFindDependencyMacro) # Find OpenDDS #This allows DDS_ROOT to be set off OpenDDSConfig.cmake location option(OPENDDS_ALLOW_ENV_CHANGE "Allow multiple find_package(opendds) calls." ON) -option(OPENDDS_FILENAME_ONLY_INCLUDES "No directory info in generated #includes." ON) find_package(OpenDDS REQUIRED) #Include idl2dll.cmake so it can be used if/when needed From 6674277cd4e28e922716b204a124ec0ad80163c5 Mon Sep 17 00:00:00 2001 From: Douglas Ayers Date: Mon, 4 Mar 2024 12:35:21 -0500 Subject: [PATCH 2/2] Remove unnecessary option. --- openddw-config.in.cmake | 2 -- 1 file changed, 2 deletions(-) diff --git a/openddw-config.in.cmake b/openddw-config.in.cmake index 9c341bd..a9c0f9b 100644 --- a/openddw-config.in.cmake +++ b/openddw-config.in.cmake @@ -7,8 +7,6 @@ set(@PROJECT_NAME@_TARGET_LIST include(CMakeFindDependencyMacro) # Find OpenDDS -#This allows DDS_ROOT to be set off OpenDDSConfig.cmake location -option(OPENDDS_ALLOW_ENV_CHANGE "Allow multiple find_package(opendds) calls." ON) find_package(OpenDDS REQUIRED) #Include idl2dll.cmake so it can be used if/when needed