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

Use new approach based on python requires and fix versions differences (conan, maven, tags)

parent 9c62e7f6
Branches main
No related tags found
No related merge requests found
...@@ -14,6 +14,8 @@ file(GLOB_RECURSE sources ...@@ -14,6 +14,8 @@ file(GLOB_RECURSE sources
src/*.cpp src/*.cpp
) )
set(JAVA_HOME "C:/Program Files/Java/jdk1.8.0_161")
set(includedirs set(includedirs
src src
${JAVA_HOME}/include/win32 ${JAVA_HOME}/include/win32
......
from conan import ConanFile from conan import ConanFile
from conan.tools.cmake import CMakeToolchain, CMake, cmake_layout, CMakeDeps
class SpectrometerRecipe(ConanFile): class SpectrometerRecipe(ConanFile):
name = "spectrometer" name = "spectrometer"
...@@ -8,6 +6,8 @@ class SpectrometerRecipe(ConanFile): ...@@ -8,6 +6,8 @@ class SpectrometerRecipe(ConanFile):
version = "1.3.0" version = "1.3.0"
package_type = "application" package_type = "application"
user = "soleil" user = "soleil"
python_requires = "base/[>=1.0]@soleil/stable"
python_requires_extend = "base.Device"
license = "GPL-3.0-or-later" license = "GPL-3.0-or-later"
author = "Alain Buteau" author = "Alain Buteau"
...@@ -24,26 +24,3 @@ class SpectrometerRecipe(ConanFile): ...@@ -24,26 +24,3 @@ class SpectrometerRecipe(ConanFile):
self.requires("omnidriver/2.46.0@soleil/stable") self.requires("omnidriver/2.46.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 layout(self):
cmake_layout(self)
def generate(self):
deps = CMakeDeps(self)
deps.generate()
tc = CMakeToolchain(self)
tc.variables["PROJECT_NAME"] = self.name
tc.variables["PROJECT_VERSION"] = self.version
tc.variables["EXECUTABLE_NAME"] = self.executable
# Requires intall of jdk-8u161-windows-i586.exe on build host
tc.variables["JAVA_HOME"] = "C:/Program Files/Java/jdk1.8.0_161"
tc.generate()
def build(self):
cmake = CMake(self)
cmake.configure()
cmake.build()
def package(self):
cmake = CMake(self)
cmake.install()
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment