Merge branch 'conan2' of...

Merge branch 'conan2' of gitlab.synchrotron-soleil.fr:software-control-system/tango-devices/inputoutput/adlink/adlinksupportlib into conan2

CMakeLists.txt

@@ -4,28 +4,36 @@ project (asl)
 option(BUILD_SHARED_LIBS "Build using shared libraries" ON)
 
 find_package(ace CONFIG REQUIRED)
+find_package(d2k-dask CONFIG REQUIRED)
+find_package(pcis-dask CONFIG REQUIRED)
 
 add_compile_definitions(PROJECT_NAME=${PROJECT_NAME})
 add_compile_definitions(PROJECT_VERSION=${PROJECT_VERSION})
 
+add_compile_definitions(ASL_HAS_DLL)
+add_compile_definitions(ASL_BUILD)
+
 file(GLOB_RECURSE sources
     src/*.cpp
 )
 
 set(includedirs 
 	src
+    include
 )
 
+list(FILTER sources EXCLUDE REGEX ".*/SingleDAQ.cpp")
+
 add_library(asl ${sources})
 target_include_directories(asl PRIVATE ${includedirs})
 target_link_libraries(asl PRIVATE ace::ace)
+target_link_libraries(asl PRIVATE d2k-dask::d2k-dask)
+target_link_libraries(asl PRIVATE pcis-dask::pcis-dask)
 
 if(MAJOR_VERSION)
   set_target_properties(asl PROPERTIES VERSION ${PROJECT_VERSION} SOVERSION ${MAJOR_VERSION})
 endif()
 
-install (DIRECTORY ${CMAKE_SOURCE_DIR}/src/ DESTINATION include
-  FILES_MATCHING PATTERN "*.h"
-)
+install (DIRECTORY ${CMAKE_SOURCE_DIR}/include/ DESTINATION include)
 
 install (TARGETS asl LIBRARY DESTINATION ${LIB_INSTALL_DIR})

conanfile.py

@@ -20,10 +20,12 @@ class aslRecipe(ConanFile):
     default_options = {"shared": False, "fPIC": True}
 
     # Sources are located in the same place as this recipe, copy them to the recipe
-    exports_sources = "CMakeLists.txt", "src/**"
+    exports_sources = "CMakeLists.txt", "src/**", "include/**"
 
     def requirements(self):
-        self.requires("ace/5.7.0@soleil/stable")
+        self.requires("ace/5.7.0@soleil/stable", transitive_headers=True, transitive_libs=True)
+        self.requires("d2k-dask/18.10@soleil/stable", transitive_headers=True, transitive_libs=True)
+        self.requires("pcis-dask/5.10@soleil/stable", transitive_headers=True, transitive_libs=True)
 
     def config_options(self):
         if self.settings.os == "Windows":

test_package/src/test_package.cpp

-#include <asl/ContinuousAI.h>
+#include <asl/Data.h>
+
+class MyData : public asl::Data
+{
+	size_t size () const override{
+		return 0;
+	}
+};
 
 int main(int argc, char* argv[]) {
-    ADLinkContinuousAI * ai = new ADLinkContinuousAI;
+    MyData * mydata = new MyData();
     return 0;
 }