mirror of
https://github.com/Chatterino/chatterino2.git
synced 2024-11-13 19:49:51 +01:00
Merge all conanfiles backinto a single file
This commit is contained in:
parent
4e1cee6793
commit
e5186d1ce2
7
.github/workflows/build.yml
vendored
7
.github/workflows/build.yml
vendored
|
@ -99,9 +99,10 @@ jobs:
|
|||
call "%programfiles(x86)%\Microsoft Visual Studio\%vs_version%\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
|
||||
mkdir build
|
||||
cd build
|
||||
conan install ..\conanfile-qmake.txt
|
||||
conan install ..
|
||||
qmake ..
|
||||
set cl=/MP
|
||||
set CL=/MP
|
||||
nmake /S /NOLOGO
|
||||
windeployqt release/chatterino.exe --release --no-compiler-runtime --no-translations --no-opengl-sw --dir Chatterino2/
|
||||
cp release/chatterino.exe Chatterino2/
|
||||
|
@ -115,8 +116,10 @@ jobs:
|
|||
call "%programfiles(x86)%\Microsoft Visual Studio\%vs_version%\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
|
||||
mkdir build
|
||||
cd build
|
||||
cmake -G"NMake Makefiles" -DCMAKE_BUILD_TYPE=Release -DUSE_PACKAGE_MANAGER=ON ..
|
||||
conan install ..
|
||||
cmake -G"NMake Makefiles" -DCMAKE_BUILD_TYPE=Release -DUSE_CONAN=ON ..
|
||||
set cl=/MP
|
||||
set CL=/MP
|
||||
nmake /S /NOLOGO
|
||||
windeployqt bin/chatterino.exe --release --no-compiler-runtime --no-translations --no-opengl-sw --dir Chatterino2/
|
||||
cp bin/chatterino.exe Chatterino2/
|
||||
|
|
|
@ -17,6 +17,13 @@ option(USE_SYSTEM_PAJLADA_SETTINGS "Use system pajlada settings library" OFF)
|
|||
option(USE_SYSTEM_LIBCOMMUNI "Use system communi library" OFF)
|
||||
option(USE_SYSTEM_QT5KEYCHAIN "Use system Qt5Keychain library" OFF)
|
||||
|
||||
option(USE_CONAN "Use conan" OFF)
|
||||
|
||||
if (USE_CONAN OR CONAN_EXPORTED)
|
||||
include(${CMAKE_CURRENT_BINARY_DIR}/conanbuildinfo.cmake)
|
||||
conan_basic_setup(TARGETS NO_OUTPUT_DIRS)
|
||||
endif()
|
||||
|
||||
find_program(CCACHE_PROGRAM ccache)
|
||||
if (CCACHE_PROGRAM)
|
||||
set(CMAKE_CXX_COMPILER_LAUNCHER "${CCACHE_PROGRAM}")
|
||||
|
|
|
@ -1,13 +0,0 @@
|
|||
[requires]
|
||||
openssl/1.1.1d
|
||||
boost/1.75.0
|
||||
|
||||
[generators]
|
||||
qmake
|
||||
cmake_find_package
|
||||
|
||||
[options]
|
||||
openssl:shared=True
|
||||
|
||||
[imports]
|
||||
bin, *.dll -> ./bin @ keep_path=False
|
|
@ -1,13 +0,0 @@
|
|||
[requires]
|
||||
qt/5.15.2
|
||||
|
||||
[generators]
|
||||
virtualbuildenv
|
||||
|
||||
[options]
|
||||
qt:widgets=True
|
||||
qt:gui=True
|
||||
# qt:network=True
|
||||
qt:qtmultimedia=True
|
||||
qt:qtsvg=True
|
||||
# qt:concurrent=True
|
|
@ -1,16 +1,9 @@
|
|||
[requires]
|
||||
openssl/1.1.1d
|
||||
boost/1.75.0
|
||||
communi/3.6.0@chatterino/local
|
||||
gtest/1.10.0
|
||||
QtKeychain/0.12.90@chatterino/local
|
||||
rapidjson/cci.20200410
|
||||
serialize/0.2@chatterino/local
|
||||
settings/0.1@chatterino/local
|
||||
signals/0.1@chatterino/local
|
||||
WebSocketpp/0.8.1@chatterino/local
|
||||
|
||||
[generators]
|
||||
qmake
|
||||
cmake
|
||||
|
||||
[options]
|
||||
|
|
Loading…
Reference in a new issue