diff --git a/CMakeLists.txt b/CMakeLists.txt index ea540d0..54f998a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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}") @@ -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 "*") diff --git a/cmake/dependencies/CMakeLists.txt b/cmake/dependencies/CMakeLists.txt index 8735156..e8b4665 100644 --- a/cmake/dependencies/CMakeLists.txt +++ b/cmake/dependencies/CMakeLists.txt @@ -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 ## ############## @@ -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 ## ############## diff --git a/cmake/utils.cmake b/cmake/utils.cmake index 2507460..e04c309 100644 --- a/cmake/utils.cmake +++ b/cmake/utils.cmake @@ -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 diff --git a/repository-config.txt.cmake b/repository-config.txt.cmake index b541e15..e69de29 100644 --- a/repository-config.txt.cmake +++ b/repository-config.txt.cmake @@ -1,2 +0,0 @@ -Sirius solver repository : @sirius_solver_REPO@ -Sirius solver branch : @sirius_solver_TAG@