diff --git a/CMakeLists.txt b/CMakeLists.txt index f6fc4c32..07630168 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -97,6 +97,10 @@ set(SETTINGS_PATH "${PROJECT_BINARY_DIR}/bin") # Add dirent.h if compiler is MSVC if(MSVC) + + find_package( Eigen3 REQUIRED ) + + find_package(GLEW REQUIRED) message("${CMAKE_SOURCE_DIR}/include") include_directories("${CMAKE_SOURCE_DIR}/include") include_directories("${CMAKE_SOURCE_DIR}/eigen-3.4.0") diff --git a/conanfile.py b/conanfile.py index 977c564e..329efc6f 100644 --- a/conanfile.py +++ b/conanfile.py @@ -1,11 +1,13 @@ from conan import ConanFile from conan.tools.cmake import CMakeToolchain +from conan.tools.cmake import cmake_layout + class LibreCAD3(ConanFile): settings = "os", "arch", "compiler", "build_type" requires = "boost/1.80.0", "eigen/3.4.0", "freetype/2.13.0", "glew/2.1.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" + generators = "CMakeToolchain", "CMakeDeps" def generate(self): tc = CMakeToolchain(self) @@ -17,3 +19,9 @@ def build(self): def package(self): self.copy("*.h", dst="include", keep_path=True) + + def build_requirements(self): + self.tool_requires("cmake/3.22.6") + + def layout(self): + cmake_layout(self)