Skip to content

Commit

Permalink
Merge pull request ipkn#198 from javierjeronimo/master
Browse files Browse the repository at this point in the history
Add compatibility with conan.io
  • Loading branch information
ipkn authored Sep 17, 2017
2 parents 05fdf17 + c03d3b2 commit c550c2b
Show file tree
Hide file tree
Showing 3 changed files with 39 additions and 2 deletions.
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -33,3 +33,6 @@ build

.directory
crow_all.h

# conan.io
build/
10 changes: 8 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
cmake_minimum_required(VERSION 2.8)
project (crow_all)

if(EXISTS "${CMAKE_BINARY_DIR}/conanbuildinfo.cmake")
include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake)
conan_basic_setup()
endif()

set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/")
find_package(Tcmalloc)
find_package(Threads)
Expand All @@ -24,13 +30,13 @@ endif()

include_directories( ${Boost_INCLUDE_DIR} )

set(PROJECT_INCLUDE_DIR
set(PROJECT_INCLUDE_DIR
${PROJECT_SOURCE_DIR}/include
)

include_directories("${PROJECT_INCLUDE_DIR}")
include_directories("${PROJECT_SOURCE_DIR}")

#add_subdirectory(src)
add_subdirectory(examples)
if (MSVC)
Expand Down
28 changes: 28 additions & 0 deletions conanfile.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
from conans import ConanFile, CMake


class CrowConan(ConanFile):
name = "Crow"
version = "0.1"
url = "https://github.com/javierjeronimo/crow"
license = "see https://github.com/ipkn/crow/blob/master/LICENSE"
generators = "cmake"
settings = "os", "compiler", "build_type", "arch"

requires = (("Boost/1.60.0@lasote/stable"),
("OpenSSL/1.0.2i@lasote/stable"))

# No exports necessary

def source(self):
# this will create a hello subfolder, take it into account
self.run("git clone https://github.com/javierjeronimo/crow.git")

def build(self):
cmake = CMake(self.settings)
self.run('cmake %s/crow %s' % (self.conanfile_directory, cmake.command_line))
self.run("cmake --build . %s" % cmake.build_config)
self.run("make")

def package(self):
self.copy("*.h", dst="include", src="amalgamate")

0 comments on commit c550c2b

Please sign in to comment.