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

Create install target #38

Closed
wants to merge 3 commits into from
Closed
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
14 changes: 2 additions & 12 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -29,18 +29,6 @@ CMAKE_DEPENDENT_OPTION(BUILD_system "Build dependencies available on system pack
CMAKE_DEPENDENT_OPTION(BUILD_not_system "Build dependencies not available on system package manager" ON
"NOT BUILD_ALL" ON)

CMAKE_DEPENDENT_OPTION(BUILD_sirius "Build sirius solver dependency Library" OFF
"NOT BUILD_not_system" ON)
message(STATUS "Build sirius solver: ${BUILD_sirius}")

if(NOT sirius_solver_REPO)
set(sirius_solver_REPO "https://github.com/rte-france/sirius-solver.git")
endif()
if(NOT sirius_solver_TAG)
set(sirius_solver_TAG "antares-integration-v1.4")
endif()


CMAKE_DEPENDENT_OPTION(BUILD_coin "Build all COIN dependency Library" OFF
"NOT BUILD_not_system" ON)
message(STATUS "Build Coin: ${BUILD_coin}")
Expand Down Expand Up @@ -98,3 +86,5 @@ configure_file(repository-config.txt.cmake ${DEPS_INSTALL_DIR}/repository-config

# Build Needed dependencies
add_subdirectory(cmake/dependencies)

install(DIRECTORY ${DEPS_INSTALL_DIR}/ DESTINATION ${CMAKE_INSTALL_PREFIX} FILES_MATCHING PATTERN "*")
44 changes: 0 additions & 44 deletions cmake/dependencies/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,24 +1,3 @@
#####################
## minizip-ng ##
#####################
find_package(minizip-ng)
if(NOT minizip-ng_FOUND)
set(REPOSITORY "https://github.com/zlib-ng/minizip-ng.git")
set(TAG "3.0.6")
set(CMAKE_ARGS_MZ "-DCMAKE_INSTALL_PREFIX=${DEPS_INSTALL_DIR} -DMZ_LZMA=OFF -DMZ_ZSTD=OFF -DMZ_BZIP2=OFF -DMZ_PKCRYPT=OFF -DMZ_WZAES=OFF -DMZ_OPENSSL=OFF -DMZ_ICONV=OFF -DMZ_COMPAT=OFF")

build_git_dependency(
NAME
minizip-ng
REPOSITORY
${REPOSITORY}
TAG
${TAG}
CMAKE_ARGS
"${CMAKE_ARGS_MZ} -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}"
)

endif()
##############
## wxWidgets ##
##############
Expand Down Expand Up @@ -50,29 +29,6 @@ if(BUILD_wxWidgets)

endif()

#####################
## Sirius solver ##
#####################
if(BUILD_sirius)

#Check if sirius is already available
find_package(sirius_solver)

if (NOT sirius_solver_FOUND)
build_git_dependency(
NAME
sirius
REPOSITORY
${sirius_solver_REPO}
TAG
${sirius_solver_TAG}
SOURCE_SUBDIR
"src"
)
endif()

endif()

##############
## GFLAGS ##
##############
Expand Down
1 change: 1 addition & 0 deletions cmake/utils.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@ function(build_git_dependency)
${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt.in
${CMAKE_CURRENT_BINARY_DIR}/${GIT_DEP_NAME}/CMakeLists.txt @ONLY)

message(STATUS "${CMAKE_COMMAND} -H. -Bproject_build -G ${CMAKE_GENERATOR}")
execute_process(
COMMAND ${CMAKE_COMMAND} -H. -Bproject_build -G "${CMAKE_GENERATOR}"
RESULT_VARIABLE result
Expand Down
2 changes: 0 additions & 2 deletions repository-config.txt.cmake
Original file line number Diff line number Diff line change
@@ -1,2 +0,0 @@
Sirius solver repository : @sirius_solver_REPO@
Sirius solver branch : @sirius_solver_TAG@
Loading