oil

LibreCAD · Aug 27, 2023 · 44d5fda · 44d5fda
1 parent 4d92613
commit 44d5fda
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -91,7 +91,7 @@ if(MSVC)
     include_directories(${glm_INCLUDE_DIR})
     add_definitions("/bigobj")
 	set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
-    SET(CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} " /w /wd4710 /wd4711")
+    SET(CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} " /w /wd4710 /wd4711 /wd4668 /wd5045 /wd9002 ")
     SET(CMAKE_C_FLAGS ${CMAKE_C_FLAGS} " /w /wd4710 /wd4711")
     # Kaguya uses a pointer to a local variable (in object.hpp file) to store class conversions.
 	# When used in different modules, the variable doesn't have the same address, preventing to mix kernel and UI bindings
@@ -109,6 +109,9 @@ set(SETTINGS_PATH "${PROJECT_BINARY_DIR}/bin")
 
 # Add dirent.h if compiler is MSVC
 if(MSVC)
+    find_package(Eigen3 REQUIRED)
+    message(eigen3: = "${Eigen3_INCLUDE_DIR}")
+    include_directories("${Eigen3_INCLUDE_DIR}")
     message("${CMAKE_SOURCE_DIR}/include")
     include_directories("third_party/msvc_dirent")
 endif()

diff --git a/conanfile.py b/conanfile.py
@@ -4,6 +4,6 @@
 
 class LibreCAD3(ConanFile):
     settings = "os", "arch", "compiler", "build_type"
-    requires = "boost/1.80.0", "eigen/3.4.0", "freetype/2.13.0", "glew/2.2.0", "glfw/3.3.8", "glm/0.9.9.8", "libdxfrw/1.0.1", "libcurl/8.2.1", "lua/5.3.5", "rapidjson/1.1.0"
+    requires = "boost/1.82.0", "eigen/3.4.0", "freetype/2.13.0", "glew/2.2.0", "glfw/3.3.8", "glm/0.9.9.8", "libdxfrw/1.0.1", "libcurl/8.2.1", "lua/5.3.5", "rapidjson/1.1.0"
     generators = "CMakeDeps", "CMakeToolchain"