Skip to content

Commit 700566d

Browse files
committed
remove SCons build files
1 parent b15935f commit 700566d

File tree

4 files changed

+18
-7
lines changed

4 files changed

+18
-7
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,8 @@ if (WITH_FPIC)
6464
add_compile_options(-fPIC)
6565
endif()
6666

67+
set (INCDIR "${PROJECT_SOURCE_DIR}/include")
6768
set (BINDIR "${PROJECT_BINARY_DIR}/bin")
68-
set (INCDIR "${PROJECT_BINARY_DIR}/include")
6969
set (LIBDIR "${PROJECT_BINARY_DIR}/lib")
7070
set (GENDIR "${PROJECT_BINARY_DIR}/gen-cpp")
7171

conan/conanfile.py

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import os
22

3-
from conans import ConanFile
3+
from conans import ConanFile, CMake
44
from conans.errors import ConanException
55
from conans.tools import download, unzip
66

@@ -50,9 +50,21 @@ def source(self):
5050
self.run("git checkout %s" % self.options.branch, cwd=self.unzipped_name)
5151

5252
def build(self):
53-
self.run('scons install prefix=`pwd`/../dist shared=%s fpic=%s build_dir=%s' %
54-
(self.options.shared, self.options.fPIC, self.unzipped_name),
55-
cwd=self.unzipped_name)
53+
self.run('conan install --build missing', cwd=self.unzipped_name)
54+
55+
build_dir = os.path.join(self.unzipped_name, 'build')
56+
57+
if not os.path.exists(build_dir):
58+
os.makedirs(build_dir)
59+
60+
cmake = CMake(self.settings)
61+
self.run('cmake .. %s -DWITH_FPIC=%s -DSHARED_LIB=%s -DCMAKE_INSTALL_PREFIX=%s' % (
62+
cmake.command_line,
63+
'ON' if self.options.fPIC else 'OFF',
64+
'ON' if self.options.shared else 'OFF',
65+
os.path.join(self.conanfile_directory, 'dist')
66+
), cwd=build_dir)
67+
self.run("cmake --build . --target install %s" % cmake.build_config, cwd=build_dir)
5668

5769
def package(self):
5870
self.copy(pattern="*.h", dst="include", src='dist/include')

conan/zipkin-cpp-0.2.0

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Subproject commit 746b3133d1b22b3445329d1dc117a21a1b96237c

conanfile.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,3 @@ gtest:shared=False
1212

1313
[generators]
1414
cmake
15-
scons
16-
txt

0 commit comments

Comments
 (0)