Merge pull request #18 from grisumbras/exports

Project exports for pkg-config and CMake.

Author: grisumbras

conanfile.py

@@ -1,25 +1,49 @@
 from conans import (
     ConanFile,
     python_requires,
+    tools,
 )
+import os
+import re
 
 
 b2 = python_requires("b2-helper/0.2.0@grisumbras/testing")
 
 
+def get_version():
+    try:
+        content = tools.load("jamroot.jam")
+        match = re.search(r"constant\s*VERSION\s*:\s*(\S+)\s*;", content)
+        return match.group(1)
+    except:
+        pass
+
+
 class EnumFlagsConan(b2.B2.Mixin, ConanFile):
     name = "enum-flags"
-    version = "0.1.0"
+    version = get_version()
     description = "Bit flags for C++ scoped enums"
     topics = "bit-mask", "bit-flag",
     author = "Dmitry Arkhipov <grisumbras@gmail.com>"
     license = "MIT"
     url = "https://github.com/grisumbras/enum-flags"
     homepage = url
 
-    exports_sources = "jamroot.jam", "build.jam", "*.hpp", "*.cpp", "LICENSE*",
+    exports_sources = (
+        "jamroot.jam",
+        "*build.jam",
+        "exports/*.jam",
+        "*.hpp",
+        "*.cpp",
+        "LICENSE*",
+    )
     no_copy_source = True
     build_requires = "boost_build/[>=1.68]@bincrafters/stable"
 
     def package_info(self):
         self.info.header_only()
+
+        pkgconfig_dir = os.path.join(self.package_folder, "lib", "pkgconfig")
+        self.env_info.PKG_CONFIG_PATH.append(pkgconfig_dir)
+
+        self.env_info.CMAKE_PREFIX_PATH.append(self.package_folder)

exports/build.jam

@@ -0,0 +1,75 @@
+import install-path ;
+import make ;
+import print ;
+
+
+prefix = [ install-path.prefix enum-flags ] ;
+execprefix = [ install-path.exec-prefix $(prefix) ] ;
+libdir = [ install-path.libdir $(execprefix) ] ;
+includedir = [ install-path.includedir $(prefix) ] ;
+
+
+make enum-flags.pc : : @write-pc ;
+install install-pc : enum-flags.pc : <location>$(libdir)/pkgconfig ;
+
+make enumflags-config.cmake : : @write-cmake-config ;
+make enumflags-config-version.cmake : : @write-cmake-version ;
+install install-cmake
+  : enumflags-config.cmake
+    enumflags-config-version.cmake
+  : <location>$(libdir)/cmake/enumflags-$(VERSION)
+  ;
+
+alias install : install-pc install-cmake ;
+explicit install install-pc install-cmake ;
+
+
+rule write-pc  ( target : sources * : properties * ) {
+  write $(target)
+    : "Name: enum-flags"
+      "Description: Bit-flags for C++ scoped enums"
+      "Version: $(VERSION)"
+      "Cflags: -I$(includedir)"
+      ""
+    ;
+}
+
+
+rule write-cmake-config ( target : sources * : properties * ) {
+  write $(target)
+    : "if(TARGET EnumFlags::EnumFlags)"
+      "  return()"
+      "endif()"
+      ""
+      "add_library(EnumFlags::EnumFlags INTERFACE IMPORTED)"
+      "set_target_properties("
+      "  EnumFlags::EnumFlags"
+      "  PROPERTIES INTERFACE_INCLUDE_DIRECTORIES \"$(includedir)\""
+      ")"
+      ""
+    ;
+}
+
+
+rule write-cmake-version ( target : sources * : properties * ) {
+  write $(target)
+    : "set(PACKAGE_VERSION $(VERSION))"
+      ""
+      "if(NOT PACKAGE_FIND_VERSION OR PACKAGE_FIND_VERSION EQUAL $(VERSION))"
+      "  set(PACKAGE_VERSION_EXACT TRUE)"
+      "  set(PACKAGE_VERSION_COMPATIBLE TRUE)"
+      "  set(PACKAGE_VERSION_UNSUITABLE FALSE)"
+      "else()"
+      "  set(PACKAGE_VERSION_EXACT FALSE)"
+      "  set(PACKAGE_VERSION_COMPATIBLE FALSE)"
+      "  set(PACKAGE_VERSION_UNSUITABLE TRUE)"
+      "endif()"
+      ""
+    ;
+}
+
+
+local rule write ( target : content * ) {
+  print.output $(target) ;
+  print.text $(content) ;
+}

exports/install-path.jam

@@ -0,0 +1,38 @@
+import modules ;
+import option ;
+import property ;
+
+
+rule prefix ( package-name : requirements * ) {
+  local prefix
+    = [ option.get prefix
+      : [ property.select <install-default-prefix> : $(requirements) ]
+      ] ;
+  prefix = $(prefix:G=) ;
+  requirements
+    = [ property.change $(requirements) : <install-default-prefix> ] ;
+
+  if ! $(prefix) {
+    if [ modules.peek : NT ] {
+      prefix = C:\\$(package-name) ;
+    } else if [ modules.peek : UNIX ] {
+      prefix = /usr/local ;
+    }
+  }
+  return $(prefix) ;
+}
+
+
+rule exec-prefix ( prefix ) {
+  return [ option.get execprefix : $(prefix) ] ;
+}
+
+
+rule libdir ( execprefix ) {
+  return [ option.get libdir : $(execprefix)/lib ] ;
+}
+
+
+rule includedir ( prefix ) {
+  return [ option.get includedir : $(prefix)/include ] ;
+}

jamroot.jam

@@ -4,6 +4,8 @@ import path ;
 
 project enum-flags ;
 
+constant VERSION : 0.1.0 ;
+
 
 alias libs : usage-requirements <include>include ;
 
@@ -18,5 +20,5 @@ explicit headers ;
 
 package.install-data license : enum-flags : LICENSE ;
 
-alias install : headers license ;
+alias install : headers license exports//install ;
 explicit install headers license ;

test/build.jam

@@ -1,7 +1,7 @@
 import testing ;
 
 
-project
+project enum-flags-test
   : requirements <warnings>all
                  <warnings-as-errors>on
   : default-build <variant>release

test/cmake/CMakeLists.txt

@@ -0,0 +1,8 @@
+cmake_minimum_required(VERSION 3.0)
+
+project(EnumFlagsUser)
+
+find_package(EnumFlags REQUIRED)
+
+add_executable(app main.cpp)
+target_link_libraries(app EnumFlags::EnumFlags)

test/cmake/main.cpp

@@ -0,0 +1,3 @@
+#include <flags/flags.hpp>
+
+int main() { return 0; }

test/conanfile.py

@@ -1,18 +1,38 @@
 from conans import (
+    CMake,
     ConanFile,
     python_requires,
 )
+import os
 
 
 b2 = python_requires("b2-helper/0.2.0@grisumbras/testing")
 
 
-class EnumFlagsTestConan(b2.B2.Mixin, ConanFile):
+class EnumFlagsTestConan(ConanFile):
     settings = "os", "compiler", "build_type", "arch", "cppstd",
     build_requires = (
         "boost_build/[>=1.68]@bincrafters/stable",
         "boost_core/[>1.60]@bincrafters/stable",
+        "cmake_installer/[>3.0]@conan/stable",
     )
+    generators = "b2"
 
     def test(self):
-        pass
+        builder = b2.B2(self)
+        builder.build_folder = os.path.join(self.build_folder, "base")
+        builder.configure()
+        builder.build()
+
+        builder = b2.B2(self)
+        builder.source_folder = os.path.join(self.source_folder, "pkgconfig")
+        builder.build_folder = os.path.join(self.build_folder, "pkgconfig")
+        builder.configure()
+        builder.build()
+
+        builder = CMake(self)
+        builder.configure(
+            source_folder=os.path.join(self.source_folder, "cmake"),
+            build_folder=os.path.join(self.build_folder, "cmake"),
+        )
+        builder.build()

test/pkgconfig/jamroot.jam

@@ -0,0 +1,29 @@
+import errors ;
+import os ;
+import string ;
+
+project enum-flags-test ;
+
+exe app : main.cpp pkgconfig-enum-flags ;
+
+
+local rule pkgconfig ( package ) {
+  local pkgconfig = [ os.environ PKG_CONFIG ] ;
+  pkgconfig ?= pkg-config ;
+
+  local result
+    = [ SHELL "$(pkgconfig) $(package) --cflags --libs"
+      : exit-status strip-eol
+      ] ;
+  if 0 != $(result[2]) {
+    errors.error Could not find package '$(package)' with pkg-config
+      "($(pkgconfig)):" $(result[1])! ;
+  }
+
+  results = [ string.words $(result[1]) ] ;
+  return <cxxflags>$(results) ;
+}
+
+alias pkgconfig-enum-flags
+  : usage-requirements [ pkgconfig enum-flags ]
+  ;

test/pkgconfig/main.cpp

@@ -0,0 +1,3 @@
+#include <flags/flags.hpp>
+
+int main() { return 0; }