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

Cleanup #913

Merged
merged 2 commits into from
Oct 25, 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
2 changes: 1 addition & 1 deletion CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ In addition to any definition or interpretation of the open source code of condu

If at any point concerns are raised that a group or member is not acting according to our values, the behaviour in question should cease, be discussed, and tried to be resolved.

We expect everyone to have a low threshold for raising issues, or in general discuss how we live up to our values.
We expect everyone to have a low threshold for raising issues, or in general discuss how we live up to our values.
Equally, we encourage all community members to appreciate when concerns are raised and do their best to solve them.

Project maintainers are responsible both for *what* is delivered, as well as *how* it is delivered.
Expand Down
8 changes: 4 additions & 4 deletions WINDOWS.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
## Prerequisits:
* Python 2.7 or 3.x https://www.python.org/ or https://anaconda.org/
* Microsoft Visual Studio https://visualstudio.microsoft.com/downloads/
* Local copy of **_libecl_**
* Local copy of **_libecl_**

## Instructions:
1. Download or clone the **_libecl_** Github repository to your local disk.
Expand All @@ -13,9 +13,9 @@

3. Download and install Microsoft Visual Studio . At a minimum **_libecl_** requires the VS Studio packages for cmake, msbuild, c and c++ compilers (CL.exe).

4. Open a MSVC command prompt such as _x64 Native Tools Command Prompt for VS 2017_ from your start menu. In the open prompt, navigate to the **_libecl_** source directory you created in step 1. Use the Python package manager **pip** to install **_libecl_** requirements via `pip install -r requirements.txt`. If Python is not accessible from the prompt it may be necessary to add the Python environment location to your system path variable `PATH`.
5. Execute the build commands with the desired CMAKE parameters from `README.md`. The cmake generator can be _`NMake Makefiles`_ , _`Ninja`_ or an appropriate version of _`MSVC`_. For the availble options type `cmake -G` in the MSVC command prompt.
4. Open a MSVC command prompt such as _x64 Native Tools Command Prompt for VS 2017_ from your start menu. In the open prompt, navigate to the **_libecl_** source directory you created in step 1. Use the Python package manager **pip** to install **_libecl_** requirements via `pip install -r requirements.txt`. If Python is not accessible from the prompt it may be necessary to add the Python environment location to your system path variable `PATH`.

5. Execute the build commands with the desired CMAKE parameters from `README.md`. The cmake generator can be _`NMake Makefiles`_ , _`Ninja`_ or an appropriate version of _`MSVC`_. For the availble options type `cmake -G` in the MSVC command prompt.

An example build and install is provided below where %VARIABLE% are user defined directory paths:
~~~~
Expand Down
13 changes: 0 additions & 13 deletions applications/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -51,19 +51,6 @@ if(BUILD_APPLICATIONS)
set_target_properties(summary PROPERTIES SUFFIX ".x")
endif()

# This minor eclipse application depends on the config parser library and
# should be moved to the libres repository - it can not be built here.
if(BUILD_ERT)
add_executable(ecl_quantile ecl/ecl_quantile.c)
target_link_libraries(ecl_quantile config)
list(APPEND apps ecl_quantile)
endif()
if(PTHREAD_LIBRARY)
add_executable(bls block_fs/bls.c)
target_link_libecl(bls)
list(APPEND apps bls)
endif()

add_executable(segment_info well/segment_info.c)
add_executable(CF_dump well/well_CF_dump.c)
add_executable(ri_well_test well/ri_well_test.c)
Expand Down
Loading
Loading