From 60cbc96e8622ab1c9f61d0e4b05aa81027fa6195 Mon Sep 17 00:00:00 2001
From: Ryan Pavlik <ryan@ryanpavlik.com>
Date: Thu, 30 Jun 2022 10:46:03 -0500
Subject: [PATCH] New upstream version 3.1+ds1

---
 CHANGELOG.md                                  | 2 +-
 CMakeLists.txt                                | 8 ++++----
 res/freedesktop/solvespace-flatpak.desktop.in | 2 +-
 res/freedesktop/solvespace-snap.desktop       | 2 +-
 res/freedesktop/solvespace.desktop.in         | 2 +-
 src/CMakeLists.txt                            | 7 +++++--
 test/CMakeLists.txt                           | 3 +++
 7 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7f6a4af..251c5f9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,7 @@
 Changelog
 =========
 
-3.x  - since the 3.0 release, only available in edge builds
+3.1  - Release Candidate 1
 ---
 
 Constraints:
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7f08e95..399e2ca 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -185,9 +185,6 @@ endif()
 message(STATUS "Using in-tree libdxfrw")
 add_subdirectory(extlib/libdxfrw)
 
-message(STATUS "Using in-tree eigen")
-include_directories(extlib/eigen)
-
 message(STATUS "Using in-tree mimalloc")
 set(MI_OVERRIDE OFF CACHE BOOL "")
 set(MI_BUILD_SHARED OFF CACHE BOOL "")
@@ -199,13 +196,16 @@ set(MIMALLOC_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/extlib/mimalloc/include)
 if(NOT FORCE_VENDORED_Eigen3)
     find_package(Eigen3 CONFIG)
 endif()
-if(FORCE_VENDORED_Eigen3 OR NOT EIGEN3_FOUND)
+if(FORCE_VENDORED_Eigen3 OR NOT EIGEN3_INCLUDE_DIRS)
     message(STATUS "Using in-tree Eigen")
     set(EIGEN3_FOUND             YES)
     set(EIGEN3_INCLUDE_DIRS      ${CMAKE_SOURCE_DIR}/extlib/eigen)
 else()
     message(STATUS "Using system Eigen: ${EIGEN3_INCLUDE_DIRS}")
 endif()
+if(NOT EXISTS "${EIGEN3_INCLUDE_DIRS}")
+    message(FATAL_ERROR "Eigen 3 not found on system or in-tree")
+endif()
 
 
 if(WIN32 OR APPLE)
diff --git a/res/freedesktop/solvespace-flatpak.desktop.in b/res/freedesktop/solvespace-flatpak.desktop.in
index c80b67a..f07f293 100644
--- a/res/freedesktop/solvespace-flatpak.desktop.in
+++ b/res/freedesktop/solvespace-flatpak.desktop.in
@@ -2,7 +2,7 @@
 Version=1.0
 Name=SolveSpace
 Comment=A parametric 2d/3d CAD
-Exec=${CMAKE_INSTALL_FULL_BINDIR}/solvespace
+Exec=${CMAKE_INSTALL_FULL_BINDIR}/solvespace %f
 MimeType=application/x-solvespace
 Icon=com.solvespace.SolveSpace
 Type=Application
diff --git a/res/freedesktop/solvespace-snap.desktop b/res/freedesktop/solvespace-snap.desktop
index da0dda1..7beceb0 100644
--- a/res/freedesktop/solvespace-snap.desktop
+++ b/res/freedesktop/solvespace-snap.desktop
@@ -2,7 +2,7 @@
 Version=1.0
 Name=SolveSpace
 Comment=A parametric 2d/3d CAD
-Exec=solvespace
+Exec=solvespace %f
 MimeType=application/x-solvespace
 Icon=${SNAP}/meta/icons/hicolor/scalable/apps/snap.solvespace.svg
 Type=Application
diff --git a/res/freedesktop/solvespace.desktop.in b/res/freedesktop/solvespace.desktop.in
index 87e6863..e9b78de 100644
--- a/res/freedesktop/solvespace.desktop.in
+++ b/res/freedesktop/solvespace.desktop.in
@@ -2,7 +2,7 @@
 Version=1.0
 Name=SolveSpace
 Comment=A parametric 2d/3d CAD
-Exec=${CMAKE_INSTALL_FULL_BINDIR}/solvespace
+Exec=${CMAKE_INSTALL_FULL_BINDIR}/solvespace %f
 MimeType=application/x-solvespace
 Icon=solvespace
 Type=Application
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 0c0277e..41c40d0 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -82,7 +82,9 @@ target_compile_definitions(slvs
     PRIVATE -DLIBRARY)
 
 target_include_directories(slvs
-    PUBLIC ${CMAKE_SOURCE_DIR}/include)
+    PUBLIC
+        ${CMAKE_SOURCE_DIR}/include
+        ${EIGEN3_INCLUDE_DIRS})
 
 target_link_libraries(slvs PRIVATE slvs_deps)
 
@@ -336,7 +338,8 @@ target_compile_definitions(solvespace-headless
     PRIVATE HEADLESS)
 
 target_include_directories(solvespace-headless
-    INTERFACE ${CMAKE_CURRENT_SOURCE_DIR})
+    INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}
+    PUBLIC ${EIGEN3_INCLUDE_DIRS})
 
 target_link_libraries(solvespace-headless
     PRIVATE
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index db812bf..eb6cf60 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -76,6 +76,9 @@ target_link_libraries(solvespace-testsuite
     solvespace-headless
     ${COVERAGE_LIBRARY})
 
+target_include_directories(solvespace-testsuite
+    PRIVATE
+    ${EIGEN3_INCLUDE_DIRS})
 add_dependencies(solvespace-testsuite
     resources)
 
-- 
2.30.2