From 7e5f86e2f4b4f1fc1a68e4f4a5cd7a3af9ea94d1 Mon Sep 17 00:00:00 2001 From: KOKIAOKI Date: Tue, 28 May 2024 10:33:12 +0900 Subject: [PATCH 1/2] fix: automatic change of eigen to include --- CMakeLists.txt | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4638cb6..38dc811 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6,10 +6,10 @@ option(USE_THIRDPARTY_EIGEN "Include thirdparty eigen" OFF) file(GLOB entries "${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/Eigen*") list(LENGTH entries num_entries) if(num_entries EQUAL 0) - set(thirdparty_empty ON) -else() - set(thirdparty_empty OFF) + set(USE_THIRDPARTY_EIGEN OFF) find_package(Eigen3 REQUIRED) +else() + set(USE_THIRDPARTY_EIGEN ON) endif() ## find OpenMP @@ -30,8 +30,10 @@ endif() # Common include directories if(USE_THIRDPARTY_EIGEN) include_directories(thirdparty/Eigen) + message(STATUS "Use thirdparty Eigen") else() include_directories(${EIGEN3_INCLUDE_DIR}) + message(STATUS "Use EIGEN3_INCLUDE_DIR") endif() include_directories( From 50c2d2b8e8da621ecd705fd8a5021e890c017aa6 Mon Sep 17 00:00:00 2001 From: KOKIAOKI Date: Tue, 28 May 2024 10:44:52 +0900 Subject: [PATCH 2/2] fix: entries --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 38dc811..a37d98f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,10 +3,10 @@ project(bbs3d) ## find thirdparty/Eigen or Eigen3 package option(USE_THIRDPARTY_EIGEN "Include thirdparty eigen" OFF) -file(GLOB entries "${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/Eigen*") +file(GLOB entries "${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/Eigen/*") list(LENGTH entries num_entries) +message(STATUS "num_entries in thirdparty/Eigen: ${num_entries}") if(num_entries EQUAL 0) - set(USE_THIRDPARTY_EIGEN OFF) find_package(Eigen3 REQUIRED) else() set(USE_THIRDPARTY_EIGEN ON)