New upstream version 3.1+ds1

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7f6a4af0a345ba4d687a089183b2016eae112ddc..251c5f98b3ce6052235c6680af60fa42d6337e09 100644 (file)
--- 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 7f08e95f2cd83ca4b6706c9a338c2bde27c57bba..399e2cae2e48626c44a80d04916ef1644cebb7ae 100644 (file)
--- 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 c80b67ad67fa712b7e0853ec0310467fc60df09e..f07f293426c7f913606153982815fc38ad36350b 100644 (file)
--- 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 da0dda13a53b3b629abe45c3a3bf1c80ac8d61b3..7beceb04584ad7aa987f797c7ed5e95dfd66e6b3 100644 (file)
--- 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 87e6863c9641f01aa1028cbf8d3b15c06aeedf1f..e9b78de23a7790648201f2a71ad4c57c8a6523b4 100644 (file)
--- 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 0c0277eef69ec40b4d60539d0c8be25041646b9e..41c40d03ae0da1b0178a36e06e869423b2ecb853 100644 (file)
--- 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 db812bfabc05c42d971e33fe6d3871a0e6e6246d..eb6cf60b48a4cd4c9f1e4e94f308cb084858b363 100644 (file)
--- 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)