From 990a8a34d090db2754d5004d0f793ea149fcd330 Mon Sep 17 00:00:00 2001 From: Javier Jerónimo Suárez Date: Sat, 19 Nov 2016 11:18:21 +0100 Subject: Trying to add support for conan.io dependency system... --- CMakeLists.txt | 4 ++++ conanfile.txt | 7 +++++++ 2 files changed, 11 insertions(+) create mode 100644 conanfile.txt diff --git a/CMakeLists.txt b/CMakeLists.txt index e2d3bc7..4d257bd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,9 @@ cmake_minimum_required(VERSION 2.8) project (crow_all) + +include(build/conanbuildinfo.cmake) +conan_basic_setup() + set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/") find_package(Tcmalloc) find_package(Threads) diff --git a/conanfile.txt b/conanfile.txt new file mode 100644 index 0000000..22b112a --- /dev/null +++ b/conanfile.txt @@ -0,0 +1,7 @@ +[requires] +Boost/1.60.0@lasote/stable +OpenSSL/1.0.2i@lasote/stable + +[generators] +cmake + -- cgit v1.2.3-54-g00ecf From bcf943b9b19552465c2482652444178152799cb4 Mon Sep 17 00:00:00 2001 From: Javier Jerónimo Suárez Date: Sat, 19 Nov 2016 11:35:49 +0100 Subject: Trying to add support for conan.io --- conanfile.py | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 conanfile.py diff --git a/conanfile.py b/conanfile.py new file mode 100644 index 0000000..416ffd1 --- /dev/null +++ b/conanfile.py @@ -0,0 +1,23 @@ +from conans import ConanFile, CMake + +class CrowConan(ConanFile): + name = "Crow" + version = "0.1" + settings = "os", "compiler", "build_type", "arch" + # 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" % cmake.build_config) + self.run("make") + + def package(self): + self.copy("*.h", dst="include", src="amalgamate") + + def package_info(self): + self.cpp_info.libs = ["crow"] + -- cgit v1.2.3-54-g00ecf From ede9a21dbc7658b64571233af8f06ee671c9888e Mon Sep 17 00:00:00 2001 From: Javier Jerónimo Suárez Date: Sat, 19 Nov 2016 11:40:17 +0100 Subject: More... --- conanfile.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/conanfile.py b/conanfile.py index 416ffd1..677c678 100644 --- a/conanfile.py +++ b/conanfile.py @@ -3,6 +3,8 @@ 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" settings = "os", "compiler", "build_type", "arch" # No exports necessary @@ -12,6 +14,7 @@ class CrowConan(ConanFile): def build(self): cmake = CMake(self.settings) + self.run('cmake %s %s' % (self.conanfile_directory, cmake.command_line)) self.run("cmake . %s" % cmake.build_config) self.run("make") -- cgit v1.2.3-54-g00ecf From 0f4cfc91086dc2d1f05407ac738a581f5768951b Mon Sep 17 00:00:00 2001 From: Javier Jerónimo Suárez Date: Sat, 19 Nov 2016 11:44:15 +0100 Subject: More --- conanfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conanfile.py b/conanfile.py index 677c678..ba12a10 100644 --- a/conanfile.py +++ b/conanfile.py @@ -14,7 +14,7 @@ class CrowConan(ConanFile): def build(self): cmake = CMake(self.settings) - self.run('cmake %s %s' % (self.conanfile_directory, cmake.command_line)) + # self.run('cmake %s %s' % (self.conanfile_directory, cmake.command_line)) self.run("cmake . %s" % cmake.build_config) self.run("make") -- cgit v1.2.3-54-g00ecf From 748a95c84fe43471c5de58122de4c778f08ae2b3 Mon Sep 17 00:00:00 2001 From: Javier Jerónimo Suárez Date: Sat, 19 Nov 2016 11:51:32 +0100 Subject: More --- conanfile.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/conanfile.py b/conanfile.py index ba12a10..533179f 100644 --- a/conanfile.py +++ b/conanfile.py @@ -1,4 +1,5 @@ from conans import ConanFile, CMake +import shutil class CrowConan(ConanFile): name = "Crow" @@ -11,6 +12,7 @@ class CrowConan(ConanFile): def source(self): # this will create a hello subfolder, take it into account self.run("git clone https://github.com/javierjeronimo/crow.git") + shutil.move("crow/*", ".") def build(self): cmake = CMake(self.settings) -- cgit v1.2.3-54-g00ecf From 09cae9f4c213628f909fd0f8a9dcdaf5e10c17dd Mon Sep 17 00:00:00 2001 From: Javier Jerónimo Suárez Date: Sat, 19 Nov 2016 11:54:34 +0100 Subject: More --- conanfile.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/conanfile.py b/conanfile.py index 533179f..b72db5c 100644 --- a/conanfile.py +++ b/conanfile.py @@ -1,5 +1,4 @@ from conans import ConanFile, CMake -import shutil class CrowConan(ConanFile): name = "Crow" @@ -12,11 +11,10 @@ class CrowConan(ConanFile): def source(self): # this will create a hello subfolder, take it into account self.run("git clone https://github.com/javierjeronimo/crow.git") - shutil.move("crow/*", ".") def build(self): cmake = CMake(self.settings) - # self.run('cmake %s %s' % (self.conanfile_directory, cmake.command_line)) + self.run('cmake %s/crow %s' % (self.conanfile_directory, cmake.command_line)) self.run("cmake . %s" % cmake.build_config) self.run("make") -- cgit v1.2.3-54-g00ecf From 5037825a59811027047c0100dced0760e78b8ff0 Mon Sep 17 00:00:00 2001 From: Javier Jerónimo Suárez Date: Sat, 19 Nov 2016 11:56:33 +0100 Subject: More --- conanfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conanfile.py b/conanfile.py index b72db5c..8a19503 100644 --- a/conanfile.py +++ b/conanfile.py @@ -15,7 +15,7 @@ class CrowConan(ConanFile): def build(self): cmake = CMake(self.settings) self.run('cmake %s/crow %s' % (self.conanfile_directory, cmake.command_line)) - self.run("cmake . %s" % cmake.build_config) + self.run("cmake --build . %s" % cmake.build_config) self.run("make") def package(self): -- cgit v1.2.3-54-g00ecf From d43cd764353cd12a40cdb9c692593d9caba2cd43 Mon Sep 17 00:00:00 2001 From: Javier Jerónimo Suárez Date: Sat, 19 Nov 2016 12:00:26 +0100 Subject: More --- conanfile.py | 1 + 1 file changed, 1 insertion(+) diff --git a/conanfile.py b/conanfile.py index 8a19503..4f2987e 100644 --- a/conanfile.py +++ b/conanfile.py @@ -6,6 +6,7 @@ class CrowConan(ConanFile): url = "https://github.com/javierjeronimo/crow" license = "see https://github.com/ipkn/crow/blob/master/LICENSE" settings = "os", "compiler", "build_type", "arch" + generators = "cmake" # No exports necessary def source(self): -- cgit v1.2.3-54-g00ecf From e9c97b1350025d93247704dc1f47a8b6fd6211cc Mon Sep 17 00:00:00 2001 From: Javier Jerónimo Suárez Date: Sat, 19 Nov 2016 12:02:04 +0100 Subject: More --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4d257bd..05a90b7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,7 +1,7 @@ cmake_minimum_required(VERSION 2.8) project (crow_all) -include(build/conanbuildinfo.cmake) +include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake) conan_basic_setup() set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/") -- cgit v1.2.3-54-g00ecf From 2877991498b009a16723a2b171967b846c8a74ca Mon Sep 17 00:00:00 2001 From: Javier Jerónimo Suárez Date: Sat, 19 Nov 2016 12:07:14 +0100 Subject: Requirements --- conanfile.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/conanfile.py b/conanfile.py index 4f2987e..cf0c798 100644 --- a/conanfile.py +++ b/conanfile.py @@ -7,6 +7,9 @@ class CrowConan(ConanFile): license = "see https://github.com/ipkn/crow/blob/master/LICENSE" settings = "os", "compiler", "build_type", "arch" generators = "cmake" + + requires = (("Boost/1.60.0@lasote/stable"), + ("OpenSSL/1.0.2i@lasote/stable")) # No exports necessary def source(self): -- cgit v1.2.3-54-g00ecf From c2f3aea0a1f60c7d2d5f586fe7abb2362c40faf3 Mon Sep 17 00:00:00 2001 From: Javier Jerónimo Suárez Date: Sat, 19 Nov 2016 12:39:13 +0100 Subject: Its a header only conan package --- conanfile.py | 1 - 1 file changed, 1 deletion(-) diff --git a/conanfile.py b/conanfile.py index cf0c798..9b06378 100644 --- a/conanfile.py +++ b/conanfile.py @@ -5,7 +5,6 @@ class CrowConan(ConanFile): version = "0.1" url = "https://github.com/javierjeronimo/crow" license = "see https://github.com/ipkn/crow/blob/master/LICENSE" - settings = "os", "compiler", "build_type", "arch" generators = "cmake" requires = (("Boost/1.60.0@lasote/stable"), -- cgit v1.2.3-54-g00ecf From 5f786cdccd2b511f867d08dbe7a10b7566e1e9fe Mon Sep 17 00:00:00 2001 From: Javier Jerónimo Suárez Date: Sun, 20 Nov 2016 22:40:47 +0100 Subject: Fixes --- conanfile.py | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/conanfile.py b/conanfile.py index 9b06378..73d9b14 100644 --- a/conanfile.py +++ b/conanfile.py @@ -6,6 +6,7 @@ class CrowConan(ConanFile): 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")) @@ -17,13 +18,9 @@ class CrowConan(ConanFile): 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") + 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") - - def package_info(self): - self.cpp_info.libs = ["crow"] - -- cgit v1.2.3-54-g00ecf From 18bc428f06d71e061e49b71813027d9ef8ab8fb0 Mon Sep 17 00:00:00 2001 From: Javier Jerónimo Suárez Date: Sun, 20 Nov 2016 22:43:34 +0100 Subject: indent --- conanfile.py | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/conanfile.py b/conanfile.py index 73d9b14..36d8ba5 100644 --- a/conanfile.py +++ b/conanfile.py @@ -1,5 +1,6 @@ from conans import ConanFile, CMake + class CrowConan(ConanFile): name = "Crow" version = "0.1" @@ -10,6 +11,7 @@ class CrowConan(ConanFile): requires = (("Boost/1.60.0@lasote/stable"), ("OpenSSL/1.0.2i@lasote/stable")) + # No exports necessary def source(self): @@ -18,9 +20,10 @@ class CrowConan(ConanFile): 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") + 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") +def package(self): + self.copy("*.h", dst="include", src="amalgamate") -- cgit v1.2.3-54-g00ecf From 79ca284d6c341f43157e038c722c30440859b1ee Mon Sep 17 00:00:00 2001 From: Javier Jerónimo Suárez Date: Sun, 20 Nov 2016 22:47:14 +0100 Subject: indent --- conanfile.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/conanfile.py b/conanfile.py index 36d8ba5..a8eb8c1 100644 --- a/conanfile.py +++ b/conanfile.py @@ -24,6 +24,5 @@ class CrowConan(ConanFile): self.run("cmake --build . %s" % cmake.build_config) self.run("make") - -def package(self): - self.copy("*.h", dst="include", src="amalgamate") + def package(self): + self.copy("*.h", dst="include", src="amalgamate") -- cgit v1.2.3-54-g00ecf From 91ac9111d45fa618a311c9dd2c8f30c031d8f46b Mon Sep 17 00:00:00 2001 From: Javier Jerónimo Suárez Date: Sun, 20 Nov 2016 23:04:25 +0100 Subject: fix --- conanfile.txt | 7 ------- 1 file changed, 7 deletions(-) delete mode 100644 conanfile.txt diff --git a/conanfile.txt b/conanfile.txt deleted file mode 100644 index 22b112a..0000000 --- a/conanfile.txt +++ /dev/null @@ -1,7 +0,0 @@ -[requires] -Boost/1.60.0@lasote/stable -OpenSSL/1.0.2i@lasote/stable - -[generators] -cmake - -- cgit v1.2.3-54-g00ecf From a71c0a0edb9262eb7dc83c67bf523fa7272d701f Mon Sep 17 00:00:00 2001 From: Javier Jerónimo Suárez Date: Sun, 20 Nov 2016 23:20:48 +0100 Subject: ignore --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index 6dcb0a2..cfe8b64 100644 --- a/.gitignore +++ b/.gitignore @@ -33,3 +33,6 @@ build .directory crow_all.h + +# conan.io +build/ -- cgit v1.2.3-54-g00ecf From c03d3b2d5aebbfc11fd85af93d6c389ca4d39d73 Mon Sep 17 00:00:00 2001 From: Javier Jerónimo Suárez Date: Tue, 22 Nov 2016 17:50:06 +0100 Subject: Make it compatible with conan.io (but optional). --- CMakeLists.txt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 05a90b7..f7f2d99 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,8 +1,10 @@ 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) @@ -28,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) -- cgit v1.2.3-54-g00ecf