From c56e1cbefa3b3c71045cc73dd73be3c6bede48e5 Mon Sep 17 00:00:00 2001 From: Stefan Vigerske Date: Fri, 8 Nov 2024 13:56:36 +0100 Subject: [PATCH] fix location of bliss installation that can happen during cmake - change to CMAKE_BINARY_DIR to get it correct when building as part of the SCIP Optimization Suite, too --- CHANGELOG | 2 ++ CMakeLists.txt | 8 ++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 49b5b79133..0e2a8fe479 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -19,6 +19,8 @@ Build system ### Cmake +- fix SCIP Optimization Suite build with -DSYM=bliss and bliss being downloaded and build during configuration by cmake + ### Makefile Miscellaneous diff --git a/CMakeLists.txt b/CMakeLists.txt index b714ca4c14..675b1d8d77 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -162,10 +162,10 @@ if(SYM STREQUAL "bliss" OR SYM STREQUAL "sbliss") if (NOT Bliss_FOUND) message(FATAL_ERROR "Automatic download of Bliss failed. Please specify the BLISS_DIR.") endif() - include_directories(${CMAKE_CURRENT_BINARY_DIR}/_deps/local/include) - set(SYM_LIBRARIES ${CMAKE_CURRENT_BINARY_DIR}/_deps/local/lib/libbliss.a) - set(SYM_PIC_LIBRARIES ${CMAKE_CURRENT_BINARY_DIR}/_deps/local/lib/libbliss.a) - message(STATUS "Installed Bliss in: ${CMAKE_CURRENT_BINARY_DIR}/_deps/local") + include_directories(${CMAKE_BINARY_DIR}/_deps/local/include) + set(SYM_LIBRARIES ${CMAKE_BINARY_DIR}/_deps/local/lib/libbliss.a) + set(SYM_PIC_LIBRARIES ${CMAKE_BINARY_DIR}/_deps/local/lib/libbliss.a) + message(STATUS "Installed Bliss in: ${CMAKE_BINARY_DIR}/_deps/local") endif() elseif(SYM STREQUAL "nauty" OR SYM STREQUAL "snauty") if(NAUTY_DIR)