Skip to content

Commit

Permalink
[Core] cmake: Remove last traces of Sofa.Component.Compat (#4596)
Browse files Browse the repository at this point in the history
remove last remnants of Sofa.Component.Compat
  • Loading branch information
fredroy committed Mar 18, 2024
1 parent c37c84f commit b5aefb4
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 11 deletions.
1 change: 0 additions & 1 deletion CMakeLists.txt
Expand Up @@ -175,7 +175,6 @@ if(SOFA_ENABLE_LEGACY_HEADERS)
message("Using legacy headers is enabled.")
endif()
sofa_add_subdirectory(library Sofa/framework/Compat Sofa.Compat ON WHEN_TO_SHOW "SOFA_ENABLE_LEGACY_HEADERS" VALUE_IF_HIDDEN OFF)
sofa_add_subdirectory(library Sofa/Component/Compat Sofa.Component.Compat ON WHEN_TO_SHOW "SOFA_ENABLE_LEGACY_HEADERS" VALUE_IF_HIDDEN OFF)

### SOFA (framework and components)
add_subdirectory(Sofa)
Expand Down
6 changes: 0 additions & 6 deletions Sofa/framework/Core/CMakeLists.txt
Expand Up @@ -347,12 +347,6 @@ if (NOT "${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
target_compile_options(${PROJECT_NAME} PRIVATE -Wno-attributes)
endif()

# SOFA-NG: make everybody be able to use Sofa.Component.Compat
sofa_find_package(Sofa.Component.Compat QUIET)
if(Sofa.Component.Compat_FOUND)
target_link_libraries(${PROJECT_NAME} PUBLIC Sofa.Component.Compat)
endif()

set_target_properties(${PROJECT_NAME} PROPERTIES FOLDER Sofa.Framework) # IDE folder

sofa_create_package_with_targets(
Expand Down
4 changes: 0 additions & 4 deletions Sofa/framework/Core/Sofa.CoreConfig.cmake.in
Expand Up @@ -9,10 +9,6 @@ find_package(Sofa.Topology QUIET REQUIRED)
find_package(Sofa.Helper QUIET REQUIRED)
find_package(Sofa.DefaultType QUIET REQUIRED)

if(SOFA_CORE_HAVE_SOFA_COMPONENT_COMPAT)
find_package(Sofa.Component.Compat QUIET REQUIRED)
endif()

if(NOT TARGET @PROJECT_NAME@)
include("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake")
endif()
Expand Down

0 comments on commit b5aefb4

Please sign in to comment.