diff --git a/conan-pkgs/QtKeychain/conanfile.py b/conan-pkgs/QtKeychain/conanfile.py index 5cd899974..713f0d5c1 100644 --- a/conan-pkgs/QtKeychain/conanfile.py +++ b/conan-pkgs/QtKeychain/conanfile.py @@ -1,7 +1,7 @@ from conans import ConanFile, CMake, tools -class LibCommuniConan(ConanFile): +class QtKeychainConan(ConanFile): name = "QtKeychain" version = "0.12.90" license = "MIT" diff --git a/conan-pkgs/Serialize/conanfile.py b/conan-pkgs/Serialize/conanfile.py index 786d58a1b..4e1651ba8 100644 --- a/conan-pkgs/Serialize/conanfile.py +++ b/conan-pkgs/Serialize/conanfile.py @@ -1,7 +1,7 @@ from conans import ConanFile, CMake, tools -class LibCommuniConan(ConanFile): +class SerializeConan(ConanFile): name = "serialize" version = "0.1" license = "MIT" @@ -18,7 +18,7 @@ class LibCommuniConan(ConanFile): git.checkout("130ffc3ec722284ca454a1e70c5478a75f380144") def package(self): - self.copy("include/*.hpp") + self.copy("*.hpp", "include", "include") def package_id(self): self.info.header_only() diff --git a/conan-pkgs/Settings/conanfile.py b/conan-pkgs/Settings/conanfile.py new file mode 100644 index 000000000..9ee179313 --- /dev/null +++ b/conan-pkgs/Settings/conanfile.py @@ -0,0 +1,35 @@ +from conans import ConanFile, CMake, tools + + +class SettingsConan(ConanFile): + name = "settings" + version = "0.1" + license = "MIT" + author = "Edgar Edgar@AnotherFoxGuy.com" + url = "https://github.com/Chatterino/chatterino2" + description = "pajlada's C++ Settings library" + settings = "os", "compiler", "build_type", "arch" + generators = "cmake" + + def requirements(self): + self.requires.add('rapidjson/cci.20200410') + self.requires.add('boost/[1.x.x]') + + def source(self): + git = tools.Git() + git.clone("https://github.com/AnotherFoxGuy/settings.git") + git.checkout("cmake-fix", "recursive") + + def build(self): + cmake = CMake(self) + cmake.definitions['CONAN_EXPORTED'] = 'ON' + cmake.definitions['BUILD_TESTS'] = 'OFF' + cmake.configure() + cmake.build() + + def package(self): + cmake = CMake(self) + cmake.install() + + def package_info(self): + self.cpp_info.libs = tools.collect_libs(self) diff --git a/conan-pkgs/Signals/conanfile.py b/conan-pkgs/Signals/conanfile.py index c6486b448..56fa6ed00 100644 --- a/conan-pkgs/Signals/conanfile.py +++ b/conan-pkgs/Signals/conanfile.py @@ -1,7 +1,7 @@ from conans import ConanFile, CMake, tools -class LibCommuniConan(ConanFile): +class SignalsConan(ConanFile): name = "signals" version = "0.1" license = "MIT" @@ -17,7 +17,7 @@ class LibCommuniConan(ConanFile): git.checkout("baf5bb04bd13b090e405e0447c89a811f7e23ddc") def package(self): - self.copy("include/*.hpp") + self.copy("*.hpp", "include", "include") def package_id(self): self.info.header_only() diff --git a/conan-pkgs/WebSocketpp/conanfile.py b/conan-pkgs/WebSocketpp/conanfile.py index 3637301bd..bc882748b 100644 --- a/conan-pkgs/WebSocketpp/conanfile.py +++ b/conan-pkgs/WebSocketpp/conanfile.py @@ -1,7 +1,7 @@ from conans import ConanFile, CMake, tools -class LibCommuniConan(ConanFile): +class WebSocketppConan(ConanFile): name = "WebSocketpp" version = "0.8.1" license = "MIT" diff --git a/conanfile.txt b/conanfile.txt index 3f1488b26..e764314f6 100644 --- a/conanfile.txt +++ b/conanfile.txt @@ -6,6 +6,8 @@ serialize/0.1@test/test QtKeychain/0.12.90@test/test signals/0.1@test/test WebSocketpp/0.8.1@test/test +rapidjson/cci.20200410 +settings/0.1@test/test [generators] cmake @@ -14,4 +16,4 @@ cmake openssl:shared=True [imports] -bin, *.dll -> ./Chatterino2 @ keep_path=False +bin, *.dll -> ./Chatterino2 @ keep_path=False \ No newline at end of file diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 80f228b3e..1029b00d0 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -26,6 +26,7 @@ target_link_libraries(${PROJECT_NAME} Qt5::Concurrent CONAN_PKG::boost CONAN_PKG::QtKeychain + CONAN_PKG::rapidjson CONAN_PKG::openssl CONAN_PKG::communi CONAN_PKG::serialize