Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove duplicated build system in alien/ArcaneInterface #1814

Open
wants to merge 12 commits into
base: main
Choose a base branch
from
Open
8 changes: 4 additions & 4 deletions alien/ArcaneInterface/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -63,14 +63,14 @@ set(HDF5_USE_CMAKE_CONFIG TRUE)
set(BUILDSYSTEM_DLL_COPY_DIRECTORY ${ARCANEFRAMEWORK_BINARY_DIR}/lib)

# Path to configuration files for Alien
set(ALIEN_CMAKE_CONFIG_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake")
set(ALIEN_CMAKE_CONFIG_PATH "${INFRA_BUILDSYSTEM_PATH}/alien")
# Path to local build-system
set(ALIEN_BUILDSYSTEM_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake/build-system")
set(ALIEN_BUILDSYSTEM_PATH "${INFRA_BUILDSYSTEM_PATH}/tools")

find_package(Arccon REQUIRED)
include(${ARCCON_CMAKE_COMMANDS}) # needed when working with 'inline' (ie not installed) Arccon

include(${ALIEN_CMAKE_CONFIG_PATH}/Functions.cmake)
#include(${ALIEN_CMAKE_CONFIG_PATH}/Functions.cmake)

include(${ALIEN_BUILDSYSTEM_PATH}/LoadBuildSystem.cmake)

Expand All @@ -96,7 +96,7 @@ include(${ALIEN_BUILDSYSTEM_PATH}/LoadDefaultPackages.cmake)
# default languages (axl)
# NB: after packages
# Incompatible avec axlstar !!
#include(LoadDefaultLanguages)
#include(LoadDefaultLanguagesr

# Alien Options
include(${ALIEN_CMAKE_CONFIG_PATH}/LoadAlienOptions.cmake)
Expand Down
159 changes: 0 additions & 159 deletions alien/ArcaneInterface/cmake/AlienLegacyConfig.h.in

This file was deleted.

51 changes: 0 additions & 51 deletions alien/ArcaneInterface/cmake/Functions.cmake

This file was deleted.

23 changes: 0 additions & 23 deletions alien/ArcaneInterface/cmake/LoadAlienLegacyConfigFile.cmake

This file was deleted.

25 changes: 0 additions & 25 deletions alien/ArcaneInterface/cmake/LoadAlienOptions.cmake

This file was deleted.

Loading
Loading