diff --git a/CMakeLists.txt b/CMakeLists.txt index a360463..4986d39 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -107,7 +107,7 @@ set(MEPHIT_CPP_SRC_FILES src/miscellaneous.cpp ) set_source_files_properties(src/mephit_run.c ${MEPHIT_C_SRC_FILES} ${MEPHIT_CPP_SRC_FILES} - PROPERTIES COMPILE_FLAGS "${CMAKE_C_FLAGS} -DREAL=double -I${TRIANGLE_INCLUDE_DIR} -I${SUITESPARSE_INCLUDE_DIRS}") + PROPERTIES COMPILE_FLAGS "${CMAKE_C_FLAGS} -DREAL=double -I${TRIANGLE_INCLUDE_DIR} -I${SUITESPARSE_INCLUDE_DIRS} -L${TRIANGLE_LIB_DIR}") ### Define library diff --git a/cmake/SetupTriangle.cmake b/cmake/SetupTriangle.cmake index e76658f..ef1c0f7 100644 --- a/cmake/SetupTriangle.cmake +++ b/cmake/SetupTriangle.cmake @@ -17,7 +17,7 @@ else()# Define Triangle repository BUILD_COMMAND /bin/bash ${CMAKE_SOURCE_DIR}/cmake/setup_triangle.sh INSTALL_COMMAND "" DOWNLOAD_EXTRACT_TIMESTAMP TRUE - BUILD_BYPRODUCTS /libtriangle.so + BUILD_BYPRODUCTS /libtriangle${CMAKE_SHARED_LIBRARY_SUFFIX} ) set(TRIANGLE_DIR ${CMAKE_BINARY_DIR}/triangle/src/TRIANGLE) endif() diff --git a/cmake/setup_triangle.sh b/cmake/setup_triangle.sh index 29dbe8d..9d0578d 100644 --- a/cmake/setup_triangle.sh +++ b/cmake/setup_triangle.sh @@ -8,15 +8,10 @@ CC=${CC:-gcc} if [ "$(uname)" == "Darwin" ]; then CFLAGS="-I/opt/homebrew/include" LDFLAGS="-L/opt/homebrew/lib" -else - CFLAGS="" - LDFLAGS="" fi -echo "Fetching and building Triangle..." -git clone https://salsa.debian.org/science-team/triangle.git -cd triangle +echo "Building Triangle..." while read -r patch; do patch -p1 < "debian/patches/$patch" done < debian/patches/series