Skip to content
Snippets Groups Projects
Commit bca1fb15 authored by Patrick MADELA's avatar Patrick MADELA
Browse files

Fix build with Conan on Windows

parent 7cad09d8
Branches
Tags
No related merge requests found
...@@ -10,6 +10,7 @@ add_compile_definitions( ...@@ -10,6 +10,7 @@ add_compile_definitions(
PROJECT_NAME=${PROJECT_NAME} PROJECT_NAME=${PROJECT_NAME}
PROJECT_VERSION=${PROJECT_VERSION} PROJECT_VERSION=${PROJECT_VERSION}
LOG4TANGO_HAVE_INT64_T LOG4TANGO_HAVE_INT64_T
WIN32_LEAN_AND_MEAN
) )
file(GLOB_RECURSE sources file(GLOB_RECURSE sources
......
from conan import ConanFile from conan import ConanFile
from conan.tools.cmake import CMakeToolchain, CMakeDeps
class electrometersRecipe(ConanFile): class electrometersRecipe(ConanFile):
name = "electrometers" name = "electrometers"
...@@ -25,11 +26,3 @@ class electrometersRecipe(ConanFile): ...@@ -25,11 +26,3 @@ class electrometersRecipe(ConanFile):
self.requires("yat/[>=1.0]@soleil/stable") self.requires("yat/[>=1.0]@soleil/stable")
if self.settings.os == "Linux": if self.settings.os == "Linux":
self.requires("crashreporting2/[>=1.0]@soleil/stable") 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")
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment