From bca1fb15b47055dd14cb26e10375fee40a2e6a51 Mon Sep 17 00:00:00 2001 From: MADELA Patrick <patrick.madela@synchrotron-soleil.fr> Date: Wed, 11 Dec 2024 10:04:52 +0100 Subject: [PATCH] Fix build with Conan on Windows --- CMakeLists.txt | 1 + conanfile.py | 9 +-------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a4f1dc7..29a37a5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,6 +10,7 @@ add_compile_definitions( PROJECT_NAME=${PROJECT_NAME} PROJECT_VERSION=${PROJECT_VERSION} LOG4TANGO_HAVE_INT64_T + WIN32_LEAN_AND_MEAN ) file(GLOB_RECURSE sources diff --git a/conanfile.py b/conanfile.py index 89a2f6c..41688dd 100644 --- a/conanfile.py +++ b/conanfile.py @@ -1,4 +1,5 @@ from conan import ConanFile +from conan.tools.cmake import CMakeToolchain, CMakeDeps class electrometersRecipe(ConanFile): name = "electrometers" @@ -25,11 +26,3 @@ class electrometersRecipe(ConanFile): self.requires("yat/[>=1.0]@soleil/stable") if self.settings.os == "Linux": self.requires("crashreporting2/[>=1.0]@soleil/stable") - - def config_options(self): - if self.settings.os == "Windows": - self.options.rm_safe("fPIC") - - def configure(self): - if self.options.shared: - self.options.rm_safe("fPIC") -- GitLab