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 deprecated ENABLE_PYTHON #915

Merged
merged 1 commit into from
Oct 26, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 0 additions & 27 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,6 @@ message(
option(BUILD_TESTS "Should the tests be built" OFF)
option(BUILD_APPLICATIONS "Should we build small utility applications" OFF)
option(BUILD_ECL_SUMMARY "Build the commandline application ecl_summary" OFF)
option(ENABLE_PYTHON "Build and install the Python wrappers" OFF)
option(BUILD_SHARED_LIBS "Build shared libraries" ON)
option(ERT_USE_OPENMP "Use OpenMP" OFF)
option(RST_DOC "Build RST documentation" OFF)
Expand Down Expand Up @@ -444,32 +443,6 @@ add_subdirectory(lib)
add_subdirectory(applications)
add_subdirectory(bin)

if(ENABLE_PYTHON)
message(
DEPRECATION
"The ENABLE_PYTHON option is deprecated and will be removed in favour of installing via pip. Refer to the README.md"
)
endif()

if(ENABLE_PYTHON AND ERT_WINDOWS)
if((NOT MSVC) OR (MSVC_VERSION LESS 1900))
message(
FATAL_ERROR "The Python wrappers require Visual Studio 2015 or newer")
endif()
endif()

if(ENABLE_PYTHON)
# If finding the Python interpreter and required packages fails in the
# python/CMakeLists.txt file the ENABLE_PYTHON will be set to OFF.
add_subdirectory(python)
endif()

if(ENABLE_PYTHON)
if(NOT ${BUILD_SHARED_LIBS})
message(FATAL_ERROR "The Python wrappers require shared libraries")
endif()
endif()

if(NOT SKBUILD)
# Avoid installing when calling from python setup.py
install(EXPORT ecl-config DESTINATION share/cmake/ecl)
Expand Down
10 changes: 0 additions & 10 deletions cmake/ert_api_check.cmake

This file was deleted.

7 changes: 0 additions & 7 deletions cmake/ert_build_check.cmake

This file was deleted.

3 changes: 0 additions & 3 deletions cmake/ert_lib_check.cmake

This file was deleted.

16 changes: 0 additions & 16 deletions cmake/ert_link.cmake

This file was deleted.

23 changes: 0 additions & 23 deletions cmake/ert_module_name.cmake

This file was deleted.

13 changes: 0 additions & 13 deletions python/CMakeLists.txt

This file was deleted.

45 changes: 0 additions & 45 deletions python/cmake/Modules/add_python_package.cmake

This file was deleted.

41 changes: 0 additions & 41 deletions python/cmake/Modules/add_python_test.cmake

This file was deleted.

182 changes: 0 additions & 182 deletions python/cmake/Modules/init_python.cmake

This file was deleted.

Loading
Loading