Merge pull request #1 from madebr/pr_volk

volk: use fixed commit hash

recipes/volk/all/CMakeLists.txt

@@ -0,0 +1,7 @@
+cmake_minimum_required(VERSION 2.8.12)
+project(cmake_wrapper)
+
+include(conanbuildinfo.cmake)
+conan_basic_setup()
+
+add_subdirectory(source_subfolder)

recipes/volk/all/conandata.yml

@@ -0,0 +1,4 @@
+sources:
+  "20200318":
+    url: "https://github.com/zeux/volk/archive/ed4c168595bc7c5d36925f0036ea14d36b20c87c.zip"
+    sha256: "7c7179db256e54cbb2b1e21dfa8ed7f050d0129723f0a2be3d607feb5b53ba1a"

recipes/volk/all/conanfile.py

@@ -1,4 +1,5 @@
 from conans import ConanFile, CMake, tools
+import os
 
 
 class VolkConan(ConanFile):
@@ -14,24 +15,60 @@ class VolkConan(ConanFile):
         loading Vulkan entrypoints directly from the driver which \
         can increase performance by skipping loader dispatch \
         overhead."
-    topics = ("Vulkan", "graphics")
+    topics = ("Vulkan", "loader", "extension", "entrypoint", "graphics")
     settings = "os", "compiler", "build_type", "arch"
+    options = {
+        "fPIC": [True, False],
+    }
+    default_options = {
+        "fPIC": True,
+    }
+    exports_sources = "CMakeLists.txt"
     generators = "cmake"
-    no_copy_source = True
+
+    _cmake = None
+
+    @property
+    def _source_subfolder(self):
+        return "source_subfolder"
+
+    def config_options(self):
+        if self.settings.os == "Windows":
+            del self.options.fPIC
+
+    def requirements(self):
+        self.requires("vulkan-headers/1.2.135.0")
 
     def source(self):
-        self.run("git clone https://github.com/zeux/volk.git")
-        self.run("cd volk/ && git checkout %s" % self.version)
+        tools.get(**self.conan_data["sources"][self.version])
+        commithash, _ = os.path.splitext(os.path.basename(self.conan_data["sources"][self.version]["url"]))
+        os.rename("volk-{}".format(commithash), self._source_subfolder)
+
+    def _configure_cmake(self):
+        if self._cmake:
+            return self._cmake
+        self._cmake = CMake(self)
+        self._cmake.definitions["VOLK_INSTALL"] = True
+        self._cmake.configure()
+        return self._cmake
+
+    def build(self):
+        cmake = self._configure_cmake()
+        cmake.build()
 
     def package(self):
-        self.copy("*volk.h", dst="include")
-        self.copy("*volk.c", dst="include")
-        self.copy("*LICENSE.md", dst="licenses")
+        self.copy("LICENSE.md", src=self._source_subfolder, dst="licenses")
+        cmake = self._configure_cmake()
+        cmake.install()
+        tools.rmdir(os.path.join(self.package_folder, "lib", "cmake"))
 
     def package_info(self):
+        self.cpp_info.components["volk_headers"].requires = ["vulkan-headers::vulkan-headers"]
         if self.settings.os == "Linux":
-            self.cpp_info.libs.extend(["dl"])
-
-    def package_id(self):
-        self.info.header_only()
+            self.cpp_info.components["volk_headers"].system_libs = ["dl"]
 
+        self.cpp_info.components["libvolk"].libs = ["volk"]
+        self.cpp_info.components["libvolk"].system_libs = ["dl"]
+        self.cpp_info.components["libvolk"].requires = ["volk_headers"]
+        self.cpp_info.components["libvolk"].names["cmake_find_package"] = ["volk"]
+        self.cpp_info.components["libvolk"].names["cmake_find_package_multi"] = ["volk"]

recipes/volk/all/test_package/CMakeLists.txt

@@ -1,14 +1,12 @@
 cmake_minimum_required(VERSION 2.8.12)
-project(PackageTest CXX)
+project(test_package C)
 
-include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake)
+include("${CMAKE_BINARY_DIR}/conanbuildinfo.cmake")
 conan_basic_setup()
 
-add_executable(example example.cpp)
-target_link_libraries(example ${CONAN_LIBS})
+add_executable(${PROJECT_NAME} test_package.c)
+target_link_libraries(${PROJECT_NAME} ${CONAN_LIBS})
 
-# CTest is a testing tool that can be used to test your project.
-# enable_testing()
-# add_test(NAME example
-#          WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/bin
-#          COMMAND example)
+add_executable(${PROJECT_NAME}_nolibs test_package.c)
+target_compile_definitions(${PROJECT_NAME}_nolibs PRIVATE VOLK_IMPLEMENTATION)
+target_link_libraries(${PROJECT_NAME}_nolibs ${CONAN_SYSTEM_LIBS_VOLK})

recipes/volk/all/test_package/conanfile.py

@@ -9,12 +9,11 @@ class VolkTestConan(ConanFile):
 
     def build(self):
         cmake = CMake(self)
-        # Current dir is "test_package/build/<build_id>" and CMakeLists.txt is
-        # in "test_package"
+        cmake.verbose = True
         cmake.configure()
         cmake.build()
 
     def test(self):
         if not tools.cross_building(self.settings):
-            os.chdir("bin")
-            self.run(".%sexample" % os.sep)
+            self.run(os.path.join("bin", "test_package"))
+            self.run(os.path.join("bin", "test_package_nolibs"))

recipes/volk/all/test_package/example.cpp → recipes/volk/all/test_package/test_package.c

@@ -1,6 +1,6 @@
-#include <iostream>
-#define VOLK_IMPLEMENTATION
-#include <volk/volk.h>
+#include "volk.h"
+
+#include <stdio.h>
 
 int main() {
     /* Try to initialize volk. This might not work on CI builds,
@@ -13,4 +13,3 @@ int main() {
             VK_VERSION_PATCH(version)
             );
 }
-

recipes/volk/config.yml

@@ -1,3 +1,4 @@
 versions:
-  "ed4c168595bc7c5d36925f0036ea14d36b20c87c":
-    folder: all
+  "20200318":
+    folder: "all"
+