Merge pull request #24 from doug1234/RemoveFilenameOnly

Removed OPENDDS_FILENAME_ONLY_INCLUDES setting which is deprecated.
OpenDDS · Mar 7, 2024 · c21d491 · c21d491
2 parents 8d1a4f9 + 6674277
commit c21d491
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 6 deletions.
diff --git 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
@@ -7,9 +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)
-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