Skip to content

Commit

Permalink
clean up
Browse files Browse the repository at this point in the history
  • Loading branch information
galabovaa committed Feb 13, 2023
1 parent 49c1ba2 commit bba3db8
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 353 deletions.
17 changes: 1 addition & 16 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,7 @@ message(STATUS "Build Fortran: ${FORTRAN}")
option(CSHARP "Build CSharp interface" OFF)
message(STATUS "Build CSharp: ${CSHARP}")

# ZLIB can be switched off, for building interfaces
option(ZLIB "Fast build: " ON)

# If wrapper are built, we need to have the install rpath in BINARY_DIR to package
Expand Down Expand Up @@ -510,18 +511,6 @@ message(STATUS "Build Python: ${BUILD_PYTHON_EXAMPLE}")
CMAKE_DEPENDENT_OPTION(BUILD_CSHARP_EXAMPLE "Build CSharp example" ON "BUILD_EXAMPLES;CSHARP" OFF)
message(STATUS "Build CSharp: ${BUILD_CSHARP_EXAMPLE}")

# By default all dependencies are NOT built (i.e. BUILD_DEPS=OFF),
# BUT if building any wrappers (Python, Java or .Net) then BUILD_DEPS=ON.
if(PYTHON)
option(BUILD_DEPS /"Build all dependencies" ON)
else()
option(BUILD_DEPS "Build all dependencies" OFF)
endif()
message(STATUS "Build all dependencies: ${BUILD_DEPS}")

# Install built dependencies if any,
option(INSTALL_BUILD_DEPS "Install build all dependencies" ON)

# IF BUILD_DEPS=ON THEN Force all BUILD_*=ON
CMAKE_DEPENDENT_OPTION(BUILD_ZLIB "Build the ZLIB dependency Library" OFF
"NOT BUILD_DEPS" ON)
Expand All @@ -532,10 +521,6 @@ if(PYTHON)
"NOT BUILD_DEPS" ON)
message(STATUS "Python: Build pybind11: ${BUILD_pybind11}")

CMAKE_DEPENDENT_OPTION(BUILD_pyomo "Build the pyomo dependency Library" OFF
"NOT BUILD_DEPS" ON)
message(STATUS "Python: Build pyomo: ${BUILD_pyomo}")

CMAKE_DEPENDENT_OPTION(BUILD_VENV "Create Python venv in BINARY_DIR/python/venv" OFF
"NOT BUILD_TESTING" ON)
message(STATUS "Python: Create venv: ${BUILD_VENV}")
Expand Down
331 changes: 0 additions & 331 deletions cmake/python-highs.cmake

This file was deleted.

12 changes: 6 additions & 6 deletions examples/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@ if(BUILD_CXX_EXAMPLE)
endforeach()
endif()

if(BUILD_PYTHON_EXAMPLE)
file(GLOB PYTHON_SRCS "*.py")
foreach(FILE_NAME IN LISTS PYTHON_SRCS)
add_python_example(${FILE_NAME})
endforeach()
endif()
# if(BUILD_PYTHON_EXAMPLE)
# file(GLOB PYTHON_SRCS "*.py")
# foreach(FILE_NAME IN LISTS PYTHON_SRCS)
# add_python_example(${FILE_NAME})
# endforeach()
# endif()

if(BUILD_CXX_EXAMPLE)
file(GLOB C "*.c")
Expand Down

0 comments on commit bba3db8

Please sign in to comment.