From db6b6de46daeb1bb7219dee292a78cbd91beaf05 Mon Sep 17 00:00:00 2001 From: Guytri KASTANE Date: Thu, 18 Apr 2024 12:38:39 +0200 Subject: [PATCH] modify nlopt variables name for openturns 1.19, 1.20.1 and 1.21 compil scripts --- products/compil_scripts/openturns-1.19.sh | 4 ++-- products/compil_scripts/openturns-1.20.1.sh | 4 ++-- products/compil_scripts/openturns-1.21.sh | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/products/compil_scripts/openturns-1.19.sh b/products/compil_scripts/openturns-1.19.sh index 62b18de..e83ec1d 100755 --- a/products/compil_scripts/openturns-1.19.sh +++ b/products/compil_scripts/openturns-1.19.sh @@ -101,8 +101,8 @@ fi ## nlopt if [ -n "$NLOPT_ROOT_DIR" ] && [ "$SAT_nlopt_IS_NATIVE" != "1" ]; then - CMAKE_OPTIONS+=" -DNLOPT_INCLUDE_DIRS:STRING=${NLOPT_ROOT_DIR}/include" - CMAKE_OPTIONS+=" -DNLOPT_LIBRARIES:STRING=${NLOPT_ROOT_DIR}/lib" + CMAKE_OPTIONS+=" -DNLOPT_INCLUDE_DIR:STRING=${NLOPT_ROOT_DIR}/include" + CMAKE_OPTIONS+=" -DNLOPT_LIBRARY:STRING=${NLOPT_ROOT_DIR}/lib/libnlopt.so" CMAKE_OPTIONS+=" -DNLOPT_DIR:STRING=${NLOPT_ROOT_DIR}" fi diff --git a/products/compil_scripts/openturns-1.20.1.sh b/products/compil_scripts/openturns-1.20.1.sh index 303d938..31e58a0 100755 --- a/products/compil_scripts/openturns-1.20.1.sh +++ b/products/compil_scripts/openturns-1.20.1.sh @@ -101,8 +101,8 @@ fi ## nlopt if [ -n "$NLOPT_ROOT_DIR" ] && [ "$SAT_nlopt_IS_NATIVE" != "1" ]; then - CMAKE_OPTIONS+=" -DNLOPT_INCLUDE_DIRS:STRING=${NLOPT_ROOT_DIR}/include" - CMAKE_OPTIONS+=" -DNLOPT_LIBRARIES:STRING=${NLOPT_ROOT_DIR}/lib" + CMAKE_OPTIONS+=" -DNLOPT_INCLUDE_DIR:STRING=${NLOPT_ROOT_DIR}/include" + CMAKE_OPTIONS+=" -DNLOPT_LIBRARY:STRING=${NLOPT_ROOT_DIR}/lib/libnlopt.so" CMAKE_OPTIONS+=" -DNLOPT_DIR:STRING=${NLOPT_ROOT_DIR}" fi diff --git a/products/compil_scripts/openturns-1.21.sh b/products/compil_scripts/openturns-1.21.sh index 2ceb922..078a97a 100755 --- a/products/compil_scripts/openturns-1.21.sh +++ b/products/compil_scripts/openturns-1.21.sh @@ -99,8 +99,8 @@ fi ## nlopt if [ -n "$NLOPT_ROOT_DIR" ] && [ "$SAT_nlopt_IS_NATIVE" != "1" ]; then - CMAKE_OPTIONS+=" -DNLOPT_INCLUDE_DIRS:STRING=${NLOPT_ROOT_DIR}/include" - CMAKE_OPTIONS+=" -DNLOPT_LIBRARIES:STRING=${NLOPT_ROOT_DIR}/lib" + CMAKE_OPTIONS+=" -DNLOPT_INCLUDE_DIR:STRING=${NLOPT_ROOT_DIR}/include" + CMAKE_OPTIONS+=" -DNLOPT_LIBRARY:STRING=${NLOPT_ROOT_DIR}/lib/libnlopt.so" CMAKE_OPTIONS+=" -DNLOPT_DIR:STRING=${NLOPT_ROOT_DIR}" fi -- 2.39.2