From 4a79e50aecca9f326ce1028ca18a5795ee2ae6d3 Mon Sep 17 00:00:00 2001 From: Eivind Jahren Date: Thu, 26 Oct 2023 09:17:34 +0200 Subject: [PATCH] Remove deprecated ENABLE_PYTHON --- CMakeLists.txt | 27 --- cmake/ert_api_check.cmake | 10 - cmake/ert_build_check.cmake | 7 - cmake/ert_lib_check.cmake | 3 - cmake/ert_link.cmake | 16 -- cmake/ert_module_name.cmake | 23 --- python/CMakeLists.txt | 13 -- python/cmake/Modules/add_python_package.cmake | 45 ----- python/cmake/Modules/add_python_test.cmake | 41 ---- python/cmake/Modules/init_python.cmake | 182 ------------------ python/docs/CMakeLists.txt | 68 ------- python/ecl/CMakeLists.txt | 22 --- python/ecl/eclfile/CMakeLists.txt | 13 -- python/ecl/gravimetry/CMakeLists.txt | 5 - python/ecl/grid/CMakeLists.txt | 7 - python/ecl/grid/faults/CMakeLists.txt | 13 -- python/ecl/rft/CMakeLists.txt | 4 - python/ecl/summary/CMakeLists.txt | 14 -- python/ecl/util/CMakeLists.txt | 9 - python/ecl/util/enums/CMakeLists.txt | 5 - python/ecl/util/geometry/CMakeLists.txt | 14 -- python/ecl/util/test/CMakeLists.txt | 18 -- python/ecl/util/test/ecl_mock/CMakeLists.txt | 5 - python/ecl/util/util/CMakeLists.txt | 23 --- python/ecl/well/CMakeLists.txt | 12 -- 25 files changed, 599 deletions(-) delete mode 100644 cmake/ert_api_check.cmake delete mode 100644 cmake/ert_build_check.cmake delete mode 100644 cmake/ert_lib_check.cmake delete mode 100644 cmake/ert_link.cmake delete mode 100644 cmake/ert_module_name.cmake delete mode 100644 python/CMakeLists.txt delete mode 100644 python/cmake/Modules/add_python_package.cmake delete mode 100644 python/cmake/Modules/add_python_test.cmake delete mode 100644 python/cmake/Modules/init_python.cmake delete mode 100644 python/docs/CMakeLists.txt delete mode 100644 python/ecl/CMakeLists.txt delete mode 100644 python/ecl/eclfile/CMakeLists.txt delete mode 100644 python/ecl/gravimetry/CMakeLists.txt delete mode 100644 python/ecl/grid/CMakeLists.txt delete mode 100644 python/ecl/grid/faults/CMakeLists.txt delete mode 100644 python/ecl/rft/CMakeLists.txt delete mode 100644 python/ecl/summary/CMakeLists.txt delete mode 100644 python/ecl/util/CMakeLists.txt delete mode 100644 python/ecl/util/enums/CMakeLists.txt delete mode 100644 python/ecl/util/geometry/CMakeLists.txt delete mode 100644 python/ecl/util/test/CMakeLists.txt delete mode 100644 python/ecl/util/test/ecl_mock/CMakeLists.txt delete mode 100644 python/ecl/util/util/CMakeLists.txt delete mode 100644 python/ecl/well/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt index 6ae91ad3f2..c69d09c7e3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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) @@ -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) diff --git a/cmake/ert_api_check.cmake b/cmake/ert_api_check.cmake deleted file mode 100644 index 612fe1e41f..0000000000 --- a/cmake/ert_api_check.cmake +++ /dev/null @@ -1,10 +0,0 @@ -# This file contains feature checks which affect the API of the final product; -# i.e. if the test for zlib fails the function buffer_fwrite_compressed() will -# not be available in the final installation. -# -# The results of these tests will be assembled in the ert/util/ert_api_config.h -# header; all the symbols in that header will have a ERT_ prefix. The generated -# header is part of the api and can be included by other header files in the ert -# source. - -# ----------------------------------------------------------------- diff --git a/cmake/ert_build_check.cmake b/cmake/ert_build_check.cmake deleted file mode 100644 index c88920890e..0000000000 --- a/cmake/ert_build_check.cmake +++ /dev/null @@ -1,7 +0,0 @@ -# This file contains checks which are used to implement portable utility -# functions. The results of these check are assembled in the generated header -# "ert/util/build_config.h" - that header is NOT part of the public api and it -# should only be included from source files as part of the compilation. -# -# Check which affect the final api are implemented in the ert_api_check.cmake -# file. diff --git a/cmake/ert_lib_check.cmake b/cmake/ert_lib_check.cmake deleted file mode 100644 index e8418d65ce..0000000000 --- a/cmake/ert_lib_check.cmake +++ /dev/null @@ -1,3 +0,0 @@ -# This file contains various checks which will append to the list -# $ERT_EXTERNAL_UTIL_LIBS which should contain all the external library -# dependencies. Observe that all library dependencies go transitively diff --git a/cmake/ert_link.cmake b/cmake/ert_link.cmake deleted file mode 100644 index ee86de8622..0000000000 --- a/cmake/ert_link.cmake +++ /dev/null @@ -1,16 +0,0 @@ -if(CMAKE_COMPILER_IS_GNUCC) - option(USE_RUNPATH "Embed original dependency paths in installed library" ON) - if(USE_RUNPATH) - set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}") - set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) - endif(USE_RUNPATH) -else() - set(USE_RUNPATH OFF) -endif() - -macro(add_runpath target) - if(NOT ERT_MAC) - set_target_properties(${target} PROPERTIES LINK_FLAGS - -Wl,--enable-new-dtags) - endif() -endmacro() diff --git a/cmake/ert_module_name.cmake b/cmake/ert_module_name.cmake deleted file mode 100644 index 17e1acb330..0000000000 --- a/cmake/ert_module_name.cmake +++ /dev/null @@ -1,23 +0,0 @@ -function(ert_module_name module module_name lib_path) - - set(osx_file ${lib_path}/${module_name}.dylib) - set(linux_file ${lib_path}/${module_name}.so) - set(win_file ${lib_path}/${module_name}.dll) - - if(${CMAKE_SYSTEM_NAME} MATCHES "Linux") - set(${module} - ${linux_file} - PARENT_SCOPE) - elseif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") - set(${module} - ${osx_file} - PARENT_SCOPE) - elseif(${CMAKE_SYSTEM_NAME} MATCHES "Windows") - set(${module} - ${win_file} - PARENT_SCOPE) - else() - message(FATAL_ERROR "Hmmm - which platform is this ??") - endif() - -endfunction() diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt deleted file mode 100644 index cd6560ee8f..0000000000 --- a/python/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} - "${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules") -include(init_python) -init_python() - -configure_file(test_env.py.in - ${PROJECT_BINARY_DIR}/${PYTHON_INSTALL_PREFIX}/test_env.py) - -add_subdirectory(ecl) - -if(RST_DOC) - add_subdirectory(docs) -endif() diff --git a/python/cmake/Modules/add_python_package.cmake b/python/cmake/Modules/add_python_package.cmake deleted file mode 100644 index bce349cbcd..0000000000 --- a/python/cmake/Modules/add_python_package.cmake +++ /dev/null @@ -1,45 +0,0 @@ -function(add_python_package target package_path source_files install_package) - - set(build_files "") - - foreach(file ${source_files}) - string(SUBSTRING ${file} 0 1 first_char) - string(SUBSTRING ${file} 1 1 second_char) - if(first_char STREQUAL "/" OR second_char STREQUAL ":") - set(source_file ${file}) - set(build_file ${file}) - file(RELATIVE_PATH file ${CMAKE_CURRENT_BINARY_DIR} ${file}) - set(dependent_target) - else() - set(source_file ${CMAKE_CURRENT_SOURCE_DIR}/${file}) - set(build_file ${PROJECT_BINARY_DIR}/${package_path}/${file}) - set(dependent_target DEPENDS ${source_file}) - endif() - if("$ENV{DESTDIR}" STREQUAL "") - set(install_file ${CMAKE_INSTALL_PREFIX}/${package_path}/${file}) - else() - set(install_file - $ENV{DESTDIR}/${CMAKE_INSTALL_PREFIX}/${package_path}/${file}) - endif() - - add_custom_command( - OUTPUT ${build_file} - COMMAND ${PYTHON_EXECUTABLE} ARGS ${PROJECT_BINARY_DIR}/bin/cmake_pyc - ${source_file} ${build_file} ${dependent_target}) - - list(APPEND build_files ${build_file}) - - if(install_package) - # For cmake versions >= 2.8.12 the preferred keyword is DIRECTORY. - get_filename_component(src_path ${file} PATH) - install(FILES ${build_file} - DESTINATION ${CMAKE_INSTALL_PREFIX}/${package_path}/${src_path}) - install( - CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE} ${PROJECT_BINARY_DIR}/bin/cmake_pyc_file ${install_file})" - ) - endif() - - endforeach() - add_custom_target(${target} ALL DEPENDS ${build_files}) - -endfunction() diff --git a/python/cmake/Modules/add_python_test.cmake b/python/cmake/Modules/add_python_test.cmake deleted file mode 100644 index 129663284e..0000000000 --- a/python/cmake/Modules/add_python_test.cmake +++ /dev/null @@ -1,41 +0,0 @@ -# This macro will create a ctest based on the supplied TEST_CLASS. The -# TEST_CLASS argument should correspond to a valid Python path, i.e. -# -# >> import ${TEST_CLASS} -# -# should work. The actual test is by running a small test script which will -# invoke normal Python test discovery functionality. This is a macro, and -# relevant variables must be crrectly set in calling scope before it is invoked: -# -# PYTHON_TEST_RUNNER: Path to executable which will load the testcase given by -# ${TEST_CLASS} and run it. -# -# CTEST_PYTHONPATH: Normal colon separated path variable, should at least -# include the binary root directory of the current python installation, but can -# in addition contain the path to additional packages. The PYTHON_TEST_RUNNER -# should inspect the $CTEST_PYTHONPATH environment variable and update sys.path -# accordingly. - -macro(addPythonTest TEST_CLASS) - set(TEST_NAME ${TEST_CLASS}) - - add_test( - NAME ${TEST_NAME} - WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/${PYTHON_INSTALL_PREFIX}" - COMMAND ${PYTHON_EXECUTABLE} ${PROJECT_BINARY_DIR}/bin/ctest_run_python - ${TEST_CLASS}) - - set(oneValueArgs LABELS) - cmake_parse_arguments(TEST_OPTIONS "" "${oneValueArgs}" "" ${ARGN}) - if(TEST_OPTIONS_LABELS) - set_property(TEST ${TEST_NAME} PROPERTY LABELS - "Python:${TEST_OPTIONS_LABELS}") - else() - set_property(TEST ${TEST_NAME} PROPERTY LABELS "Python") - endif() - - set_property( - TEST ${TEST_NAME} - PROPERTY ENVIRONMENT - "CTEST_PYTHONPATH=${CTEST_PYTHONPATH};ERT_ROOT=${ERT_ROOT}") -endmacro() diff --git a/python/cmake/Modules/init_python.cmake b/python/cmake/Modules/init_python.cmake deleted file mode 100644 index e17286711f..0000000000 --- a/python/cmake/Modules/init_python.cmake +++ /dev/null @@ -1,182 +0,0 @@ -# This macro will initialize the current cmake session for Python. The macro -# starts by looking for the Python interpreter of correct version. When a Python -# interepreter of the correct version has been located the macro will continue -# to set variables, load other cmake modules and generate scripts to be used in -# the remaining part of the cmake process. -# -# Variables which will be set: -# ---------------------------- -# -# PYTHON_INSTALL_PREFIX: All python packages will be located in -# ${GLOBAL_PREFIX}/${PYTHON_INSTALL_PREFIX} - this applies both when searching -# for dependencies and when installing. -# -# CTEST_PYTHONPATH: Normal ':' separated path variables which is passed to the -# test runner. Should contain the PYTHONPATH to all third party packages which -# are not in the default search path. The CTEST_PYTHONPATH variable will be -# updated by the python_package( ) function when searching for third party -# packages. -# -# New functions/macros which will be available: -# --------------------------------------------- -# -# add_python_package( ): This function will copy python source files to the -# build directory, 'compile' them and set up installation. -# -# add_python_test( ): Set up a test based on invoking a Python test class with a -# small python executable front end. -# -# find_python_package( ): Will search for a python package. -# -# New scripts generated: -# ---------------------- -# -# cmake_pyc: Small script which will run in-place Python compilation of a -# directory tree recursively. -# -# cmake_pyc_file: Small script which will compile one python file. -# -# ctest_run_python: Small script which will invoke one Python test class. -# -# All the generated scripts will be located in ${PROJECT_BINARY_DIR}/bin. -# -# Downstream projects should use this as: -# -# include( init_python ) init_python() ... - -macro(init_python) - - find_package(PythonInterp) - if(NOT DEFINED PYTHON_EXECUTABLE) - message( - WARNING "Python interpreter not found - Python wrappers not enabled") - set(ENABLE_PYTHON - OFF - PARENT_SCOPE) - return() - endif() - - if(EXISTS "/etc/debian_version") - set(PYTHON_PACKAGE_PATH "dist-packages") - else() - set(PYTHON_PACKAGE_PATH "site-packages") - endif() - - set(PYTHON_INSTALL_PREFIX - "lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/${PYTHON_PACKAGE_PATH}" - CACHE STRING "Subdirectory to install Python modules in") - set(CTEST_PYTHONPATH ${PROJECT_BINARY_DIR}/${PYTHON_INSTALL_PREFIX}) - configure_python_env() - include(add_python_test) - include(add_python_package) -endmacro() - -# The function configure_python_env( ) will generate three small Python scripts -# which will be located in ${PROJECT_BINARY_DIR}/bin and will be used when -# 'compiling' and testing Python code. The function will be called from the -# init_python() macro. - -function(configure_python_env) - - file( - WRITE "${PROJECT_BINARY_DIR}/bin/ctest_run_python" - "import sys -import os -from unittest import TextTestRunner - - -def runTestCase(tests, verbosity=0): - test_result = TextTestRunner(verbosity=verbosity).run(tests) - - if len(test_result.errors) or len(test_result.failures): - test_result.printErrors() - sys.exit(1) - - -# This will update both the internal sys.path load order and the -# environment variable PYTHONPATH with the following list: -# -# cwd:CTEST_PYTHONPATH:PYTHONPATH - -def update_path(): - path_list = [os.getcwd()] - - if 'CTEST_PYTHONPATH' in os.environ: - ctest_pythonpath = os.environ['CTEST_PYTHONPATH'] - for path in ctest_pythonpath.split(':'): - path_list.append( path ) - - for path in reversed(path_list): - sys.path.insert(0 , path) - - if 'PYTHONPATH' in os.environ: - pythonpath = os.environ['PYTHONPATH'] - for path in pythonpath.split(':'): - path_list.append( path ) - - os.environ['PYTHONPATH'] = ':'.join( path_list ) - - - -if __name__ == '__main__': - update_path( ) - from ecl.util.test import ErtTestRunner - for test_class in sys.argv[1:]: - tests = ErtTestRunner.getTestsFromTestClass(test_class) - - # Set verbosity to 2 to see which test method in a class that fails. - runTestCase(tests, verbosity=0) -") - - # ----------------------------------------------------------------- - - file( - WRITE "${PROJECT_BINARY_DIR}/bin/cmake_pyc" - " -import py_compile -import os -import os.path -import sys -import shutil - - -src_file = sys.argv[1] -target_file = sys.argv[2] - -(target_path , tail) = os.path.split( target_file ) -if not os.path.exists( target_path ): - try: - os.makedirs( target_path ) - except: - # When running make with multiple processes there might be a - # race to create this directory. - pass - -shutil.copyfile( src_file , target_file ) -shutil.copystat( src_file , target_file ) -try: - py_compile.compile( target_file , doraise = True) -except Exception as error: - sys.exit('py_compile(%s) failed:%s' % (target_file , error)) -") - - # ----------------------------------------------------------------- - - file( - WRITE "${PROJECT_BINARY_DIR}/bin/cmake_pyc_file" - " -import py_compile -import os -import sys -import os.path - -# Small 'python compiler' used in the build system for ert. - -for file in sys.argv[1:]: - try: - py_compile.compile( file , doraise = True ) - except Exception as error: - sys.exit('py_compile(%s) failed:%s' % (file , error)) -") - -endfunction() diff --git a/python/docs/CMakeLists.txt b/python/docs/CMakeLists.txt deleted file mode 100644 index 7de73b8ca4..0000000000 --- a/python/docs/CMakeLists.txt +++ /dev/null @@ -1,68 +0,0 @@ -find_package(Sphinx REQUIRED) - -set(DOC_INSTALL_PREFIX "share/libecl/docs") -set(doc_build "${PROJECT_BINARY_DIR}/doc_build") -file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/code" DESTINATION ${doc_build}) - -configure_file(index.rst.in "${doc_build}/index.rst") -configure_file(conf.py.in "${doc_build}/conf.py") - -add_custom_target( - api-doc ALL - COMMAND sphinx-apidoc -e -o "${doc_build}/api" - ${PROJECT_BINARY_DIR}/${PYTHON_INSTALL_PREFIX} tests - WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/${PYTHON_INSTALL_PREFIX} - DEPENDS ecl) - -add_custom_target( - html-doc ALL - COMMAND sphinx-build -b html -d ${doc_build}/doctrees ${doc_build} - ${doc_build}/html - WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/${PYTHON_INSTALL_PREFIX} - DEPENDS api-doc) - -install(DIRECTORY ${doc_build}/html - DESTINATION ${CMAKE_INSTALL_PREFIX}/${DOC_INSTALL_PREFIX}) - -# This command will configure sphinx to create a LaTeX version of the manual in -# ${doc_build}/latex - this can then subsequently be compiled with pdflatex to -# generate a pdf document. -# -# The LaTeX code generated by sphinx uses some packages which are not installed -# on RHEL 6/7, those sty files are therefor bundled with this project and copied -# manually to the LaTeX directory. -# -# Observe that at least on stock ubuntu 16.04 cmake will complain with a -# message: -# -# -- Could NOT find LATEX (missing: pdflatex) -# -# even in situatons where pdflatex is found and works ok; in this case the -# PDFLATEX_COMPILER variable is set and the pdf generation seems to work as -# expected. -find_package(LATEX COMPONENTS pdflatex) -if(PDFLATEX_COMPILER) - set(latex_workdir "${doc_build}/latex") - - add_custom_target( - latex-doc ALL - COMMAND sphinx-build -b latex -d ${doc_build}/doctrees ${doc_build} - ${latex_workdir} - WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/${PYTHON_INSTALL_PREFIX} - DEPENDS api-doc) - - file(GLOB sty_files "latex/*.sty") - file(COPY ${sty_files} DESTINATION ${latex_workdir}) - - # The pdflatex command is issued twice to let latex resolve references - # correctly. - add_custom_target( - pdf-doc ALL - COMMAND ${PDFLATEX_COMPILER} "libecl.tex" - COMMAND ${PDFLATEX_COMPILER} "libecl.tex" - DEPENDS latex-doc - WORKING_DIRECTORY ${latex_workdir}) - - install(FILES ${latex_workdir}/libecl.pdf - DESTINATION ${CMAKE_INSTALL_PREFIX}/${DOC_INSTALL_PREFIX}/pdf) -endif() diff --git a/python/ecl/CMakeLists.txt b/python/ecl/CMakeLists.txt deleted file mode 100644 index 462faaf3d0..0000000000 --- a/python/ecl/CMakeLists.txt +++ /dev/null @@ -1,22 +0,0 @@ -set(PYTHON_SOURCES __init__.py ecl_type.py ecl_util.py) -add_python_package("python.ecl" ${PYTHON_INSTALL_PREFIX}/ecl - "${PYTHON_SOURCES}" True) - -add_subdirectory(eclfile) -add_subdirectory(grid) -add_subdirectory(rft) -add_subdirectory(gravimetry) -add_subdirectory(summary) -add_subdirectory(util) -add_subdirectory(well) - -configure_file( - ecl_lib_info_build.py.in - ${PROJECT_BINARY_DIR}/${PYTHON_INSTALL_PREFIX}/ecl/__ecl_lib_info.py) -configure_file( - ecl_lib_info_install.py.in - ${PROJECT_BINARY_DIR}/${PYTHON_INSTALL_PREFIX}/ecl_lib_info_install.py) -install( - FILES ${PROJECT_BINARY_DIR}/${PYTHON_INSTALL_PREFIX}/ecl_lib_info_install.py - DESTINATION ${PYTHON_INSTALL_PREFIX}/ecl - RENAME __ecl_lib_info.py) diff --git a/python/ecl/eclfile/CMakeLists.txt b/python/ecl/eclfile/CMakeLists.txt deleted file mode 100644 index b720f6aab1..0000000000 --- a/python/ecl/eclfile/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(PYTHON_SOURCES - __init__.py - ecl_3d_file.py - ecl_file.py - ecl_file_view.py - ecl_init_file.py - ecl_restart_file.py - ecl_kw.py - fortio.py - ecl_3dkw.py) - -add_python_package("python.ecl.eclfile" ${PYTHON_INSTALL_PREFIX}/ecl/eclfile - "${PYTHON_SOURCES}" True) diff --git a/python/ecl/gravimetry/CMakeLists.txt b/python/ecl/gravimetry/CMakeLists.txt deleted file mode 100644 index 31cbfa2f16..0000000000 --- a/python/ecl/gravimetry/CMakeLists.txt +++ /dev/null @@ -1,5 +0,0 @@ -set(PYTHON_SOURCES __init__.py ecl_grav.py ecl_grav_calc.py ecl_subsidence.py) - -add_python_package( - "python.ecl.gravimetry" ${PYTHON_INSTALL_PREFIX}/ecl/gravimetry - "${PYTHON_SOURCES}" True) diff --git a/python/ecl/grid/CMakeLists.txt b/python/ecl/grid/CMakeLists.txt deleted file mode 100644 index 0ddb3c434d..0000000000 --- a/python/ecl/grid/CMakeLists.txt +++ /dev/null @@ -1,7 +0,0 @@ -set(PYTHON_SOURCES __init__.py cell.py ecl_grid.py ecl_region.py - ecl_grid_generator.py) - -add_python_package("python.ecl.grid" ${PYTHON_INSTALL_PREFIX}/ecl/grid - "${PYTHON_SOURCES}" True) - -add_subdirectory(faults) diff --git a/python/ecl/grid/faults/CMakeLists.txt b/python/ecl/grid/faults/CMakeLists.txt deleted file mode 100644 index 716c8faea0..0000000000 --- a/python/ecl/grid/faults/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -set(PYTHON_SOURCES - __init__.py - fault_block.py - fault_block_layer.py - fault_collection.py - fault.py - fault_line.py - fault_segments.py - layer.py) - -add_python_package( - "python.ecl.grid.faults" ${PYTHON_INSTALL_PREFIX}/ecl/grid/faults - "${PYTHON_SOURCES}" True) diff --git a/python/ecl/rft/CMakeLists.txt b/python/ecl/rft/CMakeLists.txt deleted file mode 100644 index 448009803c..0000000000 --- a/python/ecl/rft/CMakeLists.txt +++ /dev/null @@ -1,4 +0,0 @@ -set(PYTHON_SOURCES __init__.py well_trajectory.py ecl_rft.py ecl_rft_cell.py) - -add_python_package("python.ecl.rft" ${PYTHON_INSTALL_PREFIX}/ecl/rft - "${PYTHON_SOURCES}" True) diff --git a/python/ecl/summary/CMakeLists.txt b/python/ecl/summary/CMakeLists.txt deleted file mode 100644 index 06441f2f67..0000000000 --- a/python/ecl/summary/CMakeLists.txt +++ /dev/null @@ -1,14 +0,0 @@ -set(PYTHON_SOURCES - __init__.py - ecl_npv.py - ecl_smspec_node.py - ecl_sum.py - ecl_sum_keyword_vector.py - ecl_sum_node.py - ecl_sum_tstep.py - ecl_sum_vector.py - ecl_cmp.py - ecl_sum_var_type.py) - -add_python_package("python.ecl.summary" ${PYTHON_INSTALL_PREFIX}/ecl/summary - "${PYTHON_SOURCES}" True) diff --git a/python/ecl/util/CMakeLists.txt b/python/ecl/util/CMakeLists.txt deleted file mode 100644 index 03e9105a60..0000000000 --- a/python/ecl/util/CMakeLists.txt +++ /dev/null @@ -1,9 +0,0 @@ -set(PYTHON_SOURCES __init__.py) - -add_python_package("python.ecl.util" ${PYTHON_INSTALL_PREFIX}/ecl/util - "${PYTHON_SOURCES}" True) - -add_subdirectory(enums) -add_subdirectory(util) -add_subdirectory(test) -add_subdirectory(geometry) diff --git a/python/ecl/util/enums/CMakeLists.txt b/python/ecl/util/enums/CMakeLists.txt deleted file mode 100644 index a0598cf056..0000000000 --- a/python/ecl/util/enums/CMakeLists.txt +++ /dev/null @@ -1,5 +0,0 @@ -set(PYTHON_SOURCES __init__.py rng_alg_type_enum.py rng_init_mode_enum.py) - -add_python_package( - "python.ecl.util.enums" ${PYTHON_INSTALL_PREFIX}/ecl/util/enums - "${PYTHON_SOURCES}" True) diff --git a/python/ecl/util/geometry/CMakeLists.txt b/python/ecl/util/geometry/CMakeLists.txt deleted file mode 100644 index d3daad88ea..0000000000 --- a/python/ecl/util/geometry/CMakeLists.txt +++ /dev/null @@ -1,14 +0,0 @@ -set(PYTHON_SOURCES - __init__.py - cpolyline.py - cpolyline_collection.py - geometry_tools.py - geo_pointset.py - geo_region.py - polyline.py - xyz_io.py - surface.py) - -add_python_package( - "python.ecl.util.geometry" ${PYTHON_INSTALL_PREFIX}/ecl/util/geometry - "${PYTHON_SOURCES}" True) diff --git a/python/ecl/util/test/CMakeLists.txt b/python/ecl/util/test/CMakeLists.txt deleted file mode 100644 index 019dabe3f9..0000000000 --- a/python/ecl/util/test/CMakeLists.txt +++ /dev/null @@ -1,18 +0,0 @@ -set(PYTHON_SOURCES - __init__.py - ert_test_context.py - ert_test_runner.py - extended_testcase.py - test_run.py - source_enumerator.py - test_area.py - path_context.py - lint_test_case.py - import_test_case.py - debug_msg.py) - -add_python_package( - "python.ecl.util.test" ${PYTHON_INSTALL_PREFIX}/ecl/util/test - "${PYTHON_SOURCES}" True) - -add_subdirectory(ecl_mock) diff --git a/python/ecl/util/test/ecl_mock/CMakeLists.txt b/python/ecl/util/test/ecl_mock/CMakeLists.txt deleted file mode 100644 index 72463edee6..0000000000 --- a/python/ecl/util/test/ecl_mock/CMakeLists.txt +++ /dev/null @@ -1,5 +0,0 @@ -set(PYTHON_SOURCES __init__.py ecl_sum_mock.py) - -add_python_package( - "python.ecl.util.test.ecl_mock" - ${PYTHON_INSTALL_PREFIX}/ecl/util/test/ecl_mock "${PYTHON_SOURCES}" True) diff --git a/python/ecl/util/util/CMakeLists.txt b/python/ecl/util/util/CMakeLists.txt deleted file mode 100644 index f1c4436329..0000000000 --- a/python/ecl/util/util/CMakeLists.txt +++ /dev/null @@ -1,23 +0,0 @@ -set(PYTHON_SOURCES - __init__.py - bool_vector.py - ctime.py - double_vector.py - hash.py - int_vector.py - install_abort_signals.py - lookup_table.py - rng.py - stringlist.py - # substitution_list.py - thread_pool.py - time_vector.py - util_func.py - vector_template.py - permutation_vector.py - version.py - cwd_context.py) - -add_python_package( - "python.ecl.util.util" ${PYTHON_INSTALL_PREFIX}/ecl/util/util - "${PYTHON_SOURCES}" True) diff --git a/python/ecl/well/CMakeLists.txt b/python/ecl/well/CMakeLists.txt deleted file mode 100644 index 305d079a26..0000000000 --- a/python/ecl/well/CMakeLists.txt +++ /dev/null @@ -1,12 +0,0 @@ -set(PYTHON_SOURCES - __init__.py - well_connection.py - well_connection_direction_enum.py - well_info.py - well_segment.py - well_state.py - well_time_line.py - well_type_enum.py) - -add_python_package("python.ecl.well" ${PYTHON_INSTALL_PREFIX}/ecl/well - "${PYTHON_SOURCES}" True)