Skip to content

Commit

Permalink
Remove swig and python test related things
Browse files Browse the repository at this point in the history
  • Loading branch information
kamilritz authored and bresch committed Oct 28, 2019
1 parent d88e242 commit d79199c
Show file tree
Hide file tree
Showing 25 changed files with 7 additions and 4,837 deletions.
2 changes: 0 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,4 @@
*.gcov
*~
.cache/
.pytest_cache/
build/
EKF/tests/pytest/__pycache__/
12 changes: 2 additions & 10 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ if(CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR)
-pedantic

-Wall
#-Wextra # This was causing an issue in the swig stuff
-Wextra
-Werror

-Wno-missing-field-initializers # ignore for GCC 4.8 support
Expand All @@ -110,15 +110,6 @@ if(CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR)
DEPENDS ecl_EKF
USES_TERMINAL
)

option(EKF_PYTHON_TESTS "Build the EKF python tests" OFF)

if (EKF_PYTHON_TESTS)
# swig requires -fPIC
set(CMAKE_POSITION_INDEPENDENT_CODE ON)
endif()


endif()

# fetch latest matrix from github
Expand Down Expand Up @@ -165,6 +156,7 @@ add_subdirectory(geo)
add_subdirectory(geo_lookup)
add_subdirectory(l1)
add_subdirectory(tecs)

if(BUILD_TESTING)
add_subdirectory(validation)
add_subdirectory(test)
Expand Down
8 changes: 0 additions & 8 deletions EKF/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -57,11 +57,3 @@ target_link_libraries(ecl_EKF PRIVATE ecl_geo ecl_geo_lookup mathlib)
set_target_properties(ecl_EKF PROPERTIES PUBLIC_HEADER "ekf.h")

target_compile_options(ecl_EKF PRIVATE -fno-associative-math)

if(EKF_PYTHON_TESTS)
add_subdirectory(swig)
endif()

if(BUILD_TESTING)
add_subdirectory(tests)
endif()
42 changes: 0 additions & 42 deletions EKF/swig/CMakeLists.txt

This file was deleted.

265 changes: 0 additions & 265 deletions EKF/swig/ecl_EKF.i

This file was deleted.

Loading

0 comments on commit d79199c

Please sign in to comment.