From 522bc4a31cdf8394f05f7e91d9edfd48dc9d7060 Mon Sep 17 00:00:00 2001 From: Maxime Gimeno Date: Tue, 19 Nov 2019 09:31:50 +0100 Subject: [PATCH 1/3] Add PATHS to find_path 3mf --- Polyhedron/demo/Polyhedron/Plugins/IO/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/Polyhedron/demo/Polyhedron/Plugins/IO/CMakeLists.txt b/Polyhedron/demo/Polyhedron/Plugins/IO/CMakeLists.txt index 616414c3f4d..700262b8f9f 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/IO/CMakeLists.txt +++ b/Polyhedron/demo/Polyhedron/Plugins/IO/CMakeLists.txt @@ -80,6 +80,7 @@ endif() find_path(3MF_INCLUDE_DIR NAMES Model/COM/NMR_DLLInterfaces.h + PATHS /usr/include/lib3mf DOC "Path to lib3MF headers" ) find_library(3MF_LIBRARIES NAMES 3MF DOC "Path to the lib3MF library") From 2be81f796544fefd0e6eb349eaa52f36db1848b5 Mon Sep 17 00:00:00 2001 From: Maxime Gimeno Date: Tue, 19 Nov 2019 09:36:03 +0100 Subject: [PATCH 2/3] Add a name in FindGLPK.cmake --- Installation/cmake/modules/FindGLPK.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Installation/cmake/modules/FindGLPK.cmake b/Installation/cmake/modules/FindGLPK.cmake index b2e6f4476c5..9e060acf81d 100644 --- a/Installation/cmake/modules/FindGLPK.cmake +++ b/Installation/cmake/modules/FindGLPK.cmake @@ -15,7 +15,7 @@ if (NOT GLPK_FOUND) ) find_library(GLPK_LIBRARIES - NAMES libglpk + NAMES libglpk glpk PATHS ENV LD_LIBRARY_PATH ENV LIBRARY_PATH /usr/local/lib From 5f4eba0db6d3da9b84a4d0a0156411db616b2166 Mon Sep 17 00:00:00 2001 From: Maxime GIMENO Date: Fri, 29 Nov 2019 08:51:45 +0100 Subject: [PATCH 3/3] Update Polyhedron/demo/Polyhedron/Plugins/IO/CMakeLists.txt Co-Authored-By: Laurent Rineau --- Polyhedron/demo/Polyhedron/Plugins/IO/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Polyhedron/demo/Polyhedron/Plugins/IO/CMakeLists.txt b/Polyhedron/demo/Polyhedron/Plugins/IO/CMakeLists.txt index 700262b8f9f..01a48c330b8 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/IO/CMakeLists.txt +++ b/Polyhedron/demo/Polyhedron/Plugins/IO/CMakeLists.txt @@ -80,7 +80,7 @@ endif() find_path(3MF_INCLUDE_DIR NAMES Model/COM/NMR_DLLInterfaces.h - PATHS /usr/include/lib3mf + PATH_SUFFIXES lib3mf DOC "Path to lib3MF headers" ) find_library(3MF_LIBRARIES NAMES 3MF DOC "Path to the lib3MF library")