diff --git a/.gitignore b/.gitignore index 0d20b64..19d4809 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ *.pyc +*/test_package/build/ diff --git a/RocksDB/conanfile.py b/RocksDB/conanfile.py index 54ea100..e6321c2 100644 --- a/RocksDB/conanfile.py +++ b/RocksDB/conanfile.py @@ -21,10 +21,6 @@ class RocksDBConan(ConanFile): "bzip2/1.0.8", "lz4/1.8.0@bincrafters/stable", "gflags/2.2.2" - #"zlib/1.2.11@conan/stable", - #"bzip2/1.0.8@conan/stable", - #"lz4/1.8.0@bincrafters/stable", - #"gflags/2.2.2@bincrafters/stable" # TODO snappy, zstandard ) diff --git a/SystemC-CCI/build.py b/SystemC-CCI/build.py old mode 100644 new mode 100755 index 92c1e2d..c01a7ab --- a/SystemC-CCI/build.py +++ b/SystemC-CCI/build.py @@ -1,11 +1,13 @@ +#!/usr/bin/env python3 from conan.packager import ConanMultiPackager + if __name__ == "__main__": - builder = ConanMultiPackager() + builder = ConanMultiPackager(username="minres") types = ['Debug','Release'] cxxstds = ['98', '11','14'] libstdcxx = ['libstdc++', 'libstdc++11'] - shared = [True,False] + shared = [True, False] for triple in [[i,k,l,s] for i in cxxstds for k in types for l in libstdcxx for s in shared]: if triple[0] != '98' or triple[2] != 'libstdc++11': builder.add( diff --git a/SystemC-CCI/conanfile.py b/SystemC-CCI/conanfile.py index d618e9b..43315b0 100644 --- a/SystemC-CCI/conanfile.py +++ b/SystemC-CCI/conanfile.py @@ -22,6 +22,7 @@ class SystemC_CCIConan(ConanFile): cmake.configure( source_folder=self.source_subfolder, args=[ + '-DCMAKE_CXX_FLAGS:="-D_GLIBCXX_USE_CXX11_ABI=%d"' % (0 if self.settings.compiler.libcxx == 'libstdc++' else 1), '-DBUILD_SHARED_LIBS=ON' if self.options.shared else '-DBUILD_SHARED_LIBS=OFF', '-DCMAKE_INSTALL_LIBDIR=lib', '-DCMAKE_CXX_STANDARD=%s' % self.options.stdcxx, diff --git a/SystemC/build.py b/SystemC/build.py old mode 100644 new mode 100755 index 92c1e2d..c01a7ab --- a/SystemC/build.py +++ b/SystemC/build.py @@ -1,11 +1,13 @@ +#!/usr/bin/env python3 from conan.packager import ConanMultiPackager + if __name__ == "__main__": - builder = ConanMultiPackager() + builder = ConanMultiPackager(username="minres") types = ['Debug','Release'] cxxstds = ['98', '11','14'] libstdcxx = ['libstdc++', 'libstdc++11'] - shared = [True,False] + shared = [True, False] for triple in [[i,k,l,s] for i in cxxstds for k in types for l in libstdcxx for s in shared]: if triple[0] != '98' or triple[2] != 'libstdc++11': builder.add( diff --git a/SystemC/conanfile.py b/SystemC/conanfile.py index 7e7c3fd..40395cc 100644 --- a/SystemC/conanfile.py +++ b/SystemC/conanfile.py @@ -8,8 +8,8 @@ class SystemCConan(ConanFile): url = "https://github.com/Minres/conan-recipes/blob/master/SystemC" description = "SystemC is a set of C++ classes and macros which provide an event-driven simulation interface (see also discrete event simulation)." settings = "os", "compiler", "build_type", "arch" - options = {"shared": [True, False], "stdcxx":[98,11,14]} - default_options = "shared=True","stdcxx=98" + options = {"shared":[True, False], "stdcxx":[98,11,14], "phase_cb":[True, False]} + default_options = "shared=True","stdcxx=11","phase_cb=False" generators = "cmake" source_subfolder = "systemc-2.3.3" exports_sources = "systemc-2.3.3/*" @@ -20,9 +20,12 @@ class SystemCConan(ConanFile): cmake.configure( source_folder=self.source_subfolder, args=[ - "-DBUILD_SHARED_LIBS=ON" if self.options.shared else "-DBUILD_SHARED_LIBS=OFF", - "-DCMAKE_INSTALL_LIBDIR=lib", - '-DCMAKE_CXX_STANDARD=%s' % self.options.stdcxx + '-DCMAKE_CXX_FLAGS:="-D_GLIBCXX_USE_CXX11_ABI=%d"' % (0 if self.settings.compiler.libcxx == 'libstdc++' else 1), + '-DBUILD_SHARED_LIBS=%s' % ('ON' if self.options.shared else 'OFF'), + '-DCMAKE_INSTALL_LIBDIR=lib', + '-DCMAKE_CXX_STANDARD=%s' % self.options.stdcxx, + '-DENABLE_PHASE_CALLBACKS=%s' % ('ON' if self.options.phase_cb else 'OFF'), + '-DENABLE_PHASE_CALLBACKS_TRACING=%s' % ('ON' if self.options.phase_cb else 'OFF') ] ) cmake.build() @@ -36,5 +39,7 @@ class SystemCConan(ConanFile): #self.copy(pattern="*", dst="lib", src="package/lib", keep_path=False) def package_info(self): - self.cpp_info.libs = ["systemc", "pthread"] + self.cpp_info.libs = ["systemc"] + if self.settings.os == "Linux": + self.cpp_info.libs.append("pthread") diff --git a/SystemC/test_package/conanfile.py b/SystemC/test_package/conanfile.py index 390d4bd..e516544 100644 --- a/SystemC/test_package/conanfile.py +++ b/SystemC/test_package/conanfile.py @@ -4,7 +4,7 @@ import os class SystemcTestConan(ConanFile): settings = "os", "compiler", "build_type", "arch" options = {"stdcxx":[98,11,14], "shared":[True,False]} - default_options = "stdcxx=98","shared=True" + default_options = "stdcxx=11","shared=True" generators = "cmake" def configure(self): @@ -14,6 +14,7 @@ class SystemcTestConan(ConanFile): def build(self): cmake = CMake(self) cmake.definitions["CMAKE_CXX_STANDARD"] = self.options["SystemC"].stdcxx + cmake.definitions["CMAKE_CXX_FLAGS"]="-D_GLIBCXX_USE_CXX11_ABI=%d" %(0 if self.settings.compiler.libcxx == 'libstdc++' else 1) cmake.configure() cmake.build() diff --git a/SystemCVerification/build.py b/SystemCVerification/build.py old mode 100644 new mode 100755 index 92c1e2d..db93511 --- a/SystemCVerification/build.py +++ b/SystemCVerification/build.py @@ -1,7 +1,8 @@ +#!/usr/bin/env python3 from conan.packager import ConanMultiPackager if __name__ == "__main__": - builder = ConanMultiPackager() + builder = ConanMultiPackager(username="minres") types = ['Debug','Release'] cxxstds = ['98', '11','14'] libstdcxx = ['libstdc++', 'libstdc++11'] diff --git a/elfio/conanfile.py b/elfio/conanfile.py index 9e0c5c9..d8bd048 100644 --- a/elfio/conanfile.py +++ b/elfio/conanfile.py @@ -3,7 +3,7 @@ from conans import ConanFile, CMake, tools class ElfioConan(ConanFile): name = "elfio" - version = "1.3.2" + version = "3.4" license = "MIT License" url = "http://git.code.sf.net/p/elfio/code" description = "ELFIO is a header-only C++ library intended for reading and generating files in the ELF binary format"