diff --git a/conan-pkgs/Serialize/conanfile.py b/conan-pkgs/Serialize/conanfile.py index 4e1651ba8..90073823b 100644 --- a/conan-pkgs/Serialize/conanfile.py +++ b/conan-pkgs/Serialize/conanfile.py @@ -3,7 +3,7 @@ from conans import ConanFile, CMake, tools class SerializeConan(ConanFile): name = "serialize" - version = "0.1" + version = "0.2" license = "MIT" author = "Edgar Edgar@AnotherFoxGuy.com" url = "https://github.com/Chatterino/chatterino2" @@ -15,7 +15,7 @@ class SerializeConan(ConanFile): def source(self): git = tools.Git() git.clone("https://github.com/pajlada/serialize.git") - git.checkout("130ffc3ec722284ca454a1e70c5478a75f380144") + git.checkout("7d37cbfd5ac3bfbe046118e1cec3d32ba4696469") def package(self): self.copy("*.hpp", "include", "include") diff --git a/conanfile.txt b/conanfile.txt index 57c8a65e1..dfa0b5639 100644 --- a/conanfile.txt +++ b/conanfile.txt @@ -5,7 +5,7 @@ gtest/1.10.0 openssl/1.1.1d QtKeychain/0.12.90@chatterino/local rapidjson/cci.20200410 -serialize/0.1@chatterino/local +serialize/0.2@chatterino/local settings/0.1@chatterino/local signals/0.1@chatterino/local WebSocketpp/0.8.1@chatterino/local diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 099e64e15..caf0a1d7d 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -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}\") if (WIN32) target_compile_definitions(${PROJECT_NAME} PRIVATE USEWINSDK) + set_target_properties(${PROJECT_NAME} PROPERTIES WIN32_EXECUTABLE TRUE) endif () if (MSVC) @@ -357,6 +358,7 @@ elseif (APPLE) set(CPACK_PACKAGE_FILE_NAME "chatterino-x86-64") install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION bin + BUNDLE DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib/static )