noury/mirror-chatterino2
1
0
Fork 0
mirror of https://github.com/Chatterino/chatterino2.git synced 2024-11-13 19:49:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

🔧 Update serialize lib

Browse source
This commit is contained in:
Edgar 2021-02-19 11:09:34 +01:00 committed by Rasmus Karlsson
parent 6913a6312c
commit 5678ab00d2
3 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
conan-pkgs/Serialize/conanfile.py
View file

@ -3,7 +3,7 @@ from conans import ConanFile, CMake, tools
class SerializeConan(ConanFile): class SerializeConan(ConanFile):
name = "serialize" name = "serialize"
version = "0.1" version = "0.2"
license = "MIT" license = "MIT"
author = "Edgar Edgar@AnotherFoxGuy.com" author = "Edgar Edgar@AnotherFoxGuy.com"
url = "https://github.com/Chatterino/chatterino2" url = "https://github.com/Chatterino/chatterino2"
@ -15,7 +15,7 @@ class SerializeConan(ConanFile):
def source(self): def source(self):
git = tools.Git() git = tools.Git()
git.clone("https://github.com/pajlada/serialize.git") git.clone("https://github.com/pajlada/serialize.git")
git.checkout("130ffc3ec722284ca454a1e70c5478a75f380144") git.checkout("7d37cbfd5ac3bfbe046118e1cec3d32ba4696469")
def package(self): def package(self):
self.copy("*.hpp", "include", "include") self.copy("*.hpp", "include", "include")

2
conanfile.txt
View file

@ -5,7 +5,7 @@ gtest/1.10.0
openssl/1.1.1d openssl/1.1.1d
QtKeychain/0.12.90@chatterino/local QtKeychain/0.12.90@chatterino/local
rapidjson/cci.20200410 rapidjson/cci.20200410
serialize/0.1@chatterino/local serialize/0.2@chatterino/local
settings/0.1@chatterino/local settings/0.1@chatterino/local
signals/0.1@chatterino/local signals/0.1@chatterino/local
WebSocketpp/0.8.1@chatterino/local WebSocketpp/0.8.1@chatterino/local

2
src/CMakeLists.txt
View file

@ -229,6 +229,7 @@ target_compile_definitions(${PROJECT_NAME} PRIVATE CMAKE_BUILD CHATTERINO UNICOD
target_compile_definitions(${PROJECT_NAME} PRIVATE CHATTERINO_GIT_HASH=\"${GIT_HASH}\" CHATTERINO_GIT_RELEASE=\"${GIT_RELEASE}\" CHATTERINO_GIT_COMMIT=\"${GIT_COMMIT}\") target_compile_definitions(${PROJECT_NAME} PRIVATE CHATTERINO_GIT_HASH=\"${GIT_HASH}\" CHATTERINO_GIT_RELEASE=\"${GIT_RELEASE}\" CHATTERINO_GIT_COMMIT=\"${GIT_COMMIT}\")
if (WIN32) if (WIN32)
target_compile_definitions(${PROJECT_NAME} PRIVATE USEWINSDK) target_compile_definitions(${PROJECT_NAME} PRIVATE USEWINSDK)
set_target_properties(${PROJECT_NAME} PROPERTIES WIN32_EXECUTABLE TRUE)
endif () endif ()
if (MSVC) if (MSVC)
@ -357,6 +358,7 @@ elseif (APPLE)
set(CPACK_PACKAGE_FILE_NAME "chatterino-x86-64") set(CPACK_PACKAGE_FILE_NAME "chatterino-x86-64")
install(TARGETS ${PROJECT_NAME} install(TARGETS ${PROJECT_NAME}
RUNTIME DESTINATION bin RUNTIME DESTINATION bin
BUNDLE DESTINATION bin
LIBRARY DESTINATION lib LIBRARY DESTINATION lib
ARCHIVE DESTINATION lib/static ARCHIVE DESTINATION lib/static
) )