From 8421745fe5043d05950d02d9c94c95bb89602c46 Mon Sep 17 00:00:00 2001 From: Thomas <purcell@fhi-berlin.mpg.de> Date: Fri, 10 Sep 2021 15:56:29 +0200 Subject: [PATCH] Add check for installed include directories to make install commands for Coin-Or --- CMakeLists.txt | 4 ++-- cmake/CoinUtils/coin_utils_make_install.sh | 2 +- cmake/coin-Clp/clp_make_install.sh | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4e4c7b99..dc2b3098 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -390,8 +390,8 @@ message(STATUS "COIN_CLP_BLAS_LAPACK_LIBS = ${COIN_CLP_BLAS_LAPACK_LIBS}") set(COIN_CLP_CONFIGURE_COMMAND bash ${CMAKE_CURRENT_LIST_DIR}/cmake/coin-Clp/clp_configure.sh ${COIN_CLP_INSTALL_DIR} ${COIN_CLP_BLAS_LAPACK_LIBS} ${COIN_CLP_CXX} ${COIN_CLP_LIBRARY_DIRS} "${COIN_UTILS_LIBRARY_DIRS}/libCoinUtils.so" ${COIN_UTILS_INCLUDE_DIRS}) set(COIN_UTILS_CONFIGURE_COMMAND bash ${CMAKE_CURRENT_LIST_DIR}/cmake/CoinUtils/coin_utils_configure.sh ${COIN_UTILS_INSTALL_DIR} ${COIN_CLP_BLAS_LAPACK_LIBS} ${COIN_CLP_CXX} ${COIN_CLP_LIBRARY_DIRS}) -set(COIN_UTILS_MAKE_INSTALL_COMMAND bash ${CMAKE_CURRENT_LIST_DIR}/cmake/CoinUtils/coin_utils_make_install.sh ${COIN_UTILS_LIBRARY_DIRS}/libCoinUtils.so) -set(COIN_CLP_MAKE_INSTALL_COMMAND bash ${CMAKE_CURRENT_LIST_DIR}/cmake/coin-Clp/clp_make_install.sh ${COIN_CLP_LIBRARY_DIRS}/libClp.so) +set(COIN_UTILS_MAKE_INSTALL_COMMAND bash ${CMAKE_CURRENT_LIST_DIR}/cmake/CoinUtils/coin_utils_make_install.sh ${COIN_UTILS_LIBRARY_DIRS}/libCoinUtils.so ${COIN_UTILS_INCLUDE_DIRS}) +set(COIN_CLP_MAKE_INSTALL_COMMAND bash ${CMAKE_CURRENT_LIST_DIR}/cmake/coin-Clp/clp_make_install.sh ${COIN_CLP_LIBRARY_DIRS}/libClp.so ${COIN_CLP_INCLUDE_DIRS}) ExternalProject_Add( external_CoinUtils diff --git a/cmake/CoinUtils/coin_utils_make_install.sh b/cmake/CoinUtils/coin_utils_make_install.sh index d6a6573e..4e4aa55e 100644 --- a/cmake/CoinUtils/coin_utils_make_install.sh +++ b/cmake/CoinUtils/coin_utils_make_install.sh @@ -1,2 +1,2 @@ #! /usr/bin/bash -if [ ! -f $1 ]; then make install; fi +if [ ! -f $1 ] || [ ! -d $2 ]; then make install; fi diff --git a/cmake/coin-Clp/clp_make_install.sh b/cmake/coin-Clp/clp_make_install.sh index d6a6573e..4e4aa55e 100644 --- a/cmake/coin-Clp/clp_make_install.sh +++ b/cmake/coin-Clp/clp_make_install.sh @@ -1,2 +1,2 @@ #! /usr/bin/bash -if [ ! -f $1 ]; then make install; fi +if [ ! -f $1 ] || [ ! -d $2 ]; then make install; fi -- GitLab