Skip to content

Commit 85cd729

Browse files
authored
CMake: Remove file reorganization backward compatibility code (#176)
The feature has already been disabled, and the related source code is no longer required [ROCm/ROCR-Runtime commit: 1785cff]
1 parent 4ac71d1 commit 85cd729

File tree

4 files changed

+0
-250
lines changed

4 files changed

+0
-250
lines changed

projects/rocr-runtime/libhsakmt/CMakeLists.txt

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -213,26 +213,6 @@ install ( TARGETS ${HSAKMT_TARGET}
213213
install ( DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/${HSAKMT_TARGET} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
214214
COMPONENT dev PATTERN "linux" EXCLUDE )
215215

216-
# Option to build header path migration helpers.
217-
option(INCLUDE_PATH_COMPATIBILITY "Generate backward compatible headers and include paths. Use of these headers will warn when included." OFF)
218-
219-
if(INCLUDE_PATH_COMPATIBILITY)
220-
# To enable/disable #error in wrapper header files
221-
if(NOT DEFINED ROCM_HEADER_WRAPPER_WERROR)
222-
if(DEFINED ENV{ROCM_HEADER_WRAPPER_WERROR})
223-
set(ROCM_HEADER_WRAPPER_WERROR "$ENV{ROCM_HEADER_WRAPPER_WERROR}"
224-
CACHE STRING "Header wrapper warnings as errors.")
225-
else()
226-
set(ROCM_HEADER_WRAPPER_WERROR "OFF" CACHE STRING "Header wrapper warnings as errors.")
227-
endif()
228-
endif()
229-
if(ROCM_HEADER_WRAPPER_WERROR)
230-
set(deprecated_error 1)
231-
else()
232-
set(deprecated_error 0)
233-
endif()
234-
include(hsakmt-backward-compat.cmake)
235-
endif()
236216
# Record our usage data for clients find_package calls.
237217
install ( EXPORT ${HSAKMT_TARGET}Targets
238218
FILE ${HSAKMT_TARGET}Targets.cmake

projects/rocr-runtime/libhsakmt/hsakmt-backward-compat.cmake

Lines changed: 0 additions & 91 deletions
This file was deleted.

projects/rocr-runtime/runtime/hsa-runtime/CMakeLists.txt

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -360,29 +360,6 @@ install ( FILES ${CMAKE_CURRENT_SOURCE_DIR}/LICENSE.md DESTINATION ${CMAKE_INSTA
360360

361361
# Install public headers
362362
install ( DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/inc/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/hsa COMPONENT dev )
363-
# Option to build header path migration helpers.
364-
option(INCLUDE_PATH_COMPATIBILITY "Generate backward compatible headers and include paths. Use of these headers will warn when included." OFF)
365-
if(INCLUDE_PATH_COMPATIBILITY)
366-
# To enable/disable #error in wrapper header files
367-
if(NOT DEFINED ROCM_HEADER_WRAPPER_WERROR)
368-
if(DEFINED ENV{ROCM_HEADER_WRAPPER_WERROR})
369-
set(ROCM_HEADER_WRAPPER_WERROR "$ENV{ROCM_HEADER_WRAPPER_WERROR}"
370-
CACHE STRING "Header wrapper warnings as errors.")
371-
else()
372-
set(ROCM_HEADER_WRAPPER_WERROR "OFF" CACHE STRING "Header wrapper warnings as errors.")
373-
endif()
374-
endif()
375-
if(ROCM_HEADER_WRAPPER_WERROR)
376-
set(deprecated_error 1)
377-
else()
378-
set(deprecated_error 0)
379-
endif()
380-
381-
include(hsa-backward-compat.cmake)
382-
target_include_directories( ${CORE_RUNTIME_TARGET}
383-
PUBLIC
384-
$<INSTALL_INTERFACE:hsa/include/hsa> )
385-
endif()
386363

387364
## Configure and install package config file
388365
# Record our usage data for clients find_package calls.

projects/rocr-runtime/runtime/hsa-runtime/hsa-backward-compat.cmake

Lines changed: 0 additions & 116 deletions
This file was deleted.

0 commit comments

Comments
 (0)