diff options
| author | Joseph Donofry <joedonofry@gmail.com> | 2019-05-22 22:06:45 -0400 |
|---|---|---|
| committer | Joseph Donofry <joedonofry@gmail.com> | 2019-05-22 22:06:45 -0400 |
| commit | e52f29a7547e0b0df9594b6a414384b861d7957e (patch) | |
| tree | e1b2e8e3f55e6aaf0425b09c10252d1140d8ba6a | |
| parent | 2ff115577b8e4b76659c1ba76c76dd89ea8b8c23 (diff) | |
Minor build tweaks
| -rw-r--r-- | appveyor.yml | 5 | ||||
| -rw-r--r-- | deps/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | deps/cmake/MatrixClient.cmake | 8 |
3 files changed, 11 insertions, 3 deletions
diff --git a/appveyor.yml b/appveyor.yml index ec82810c..0504e73e 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -59,6 +59,7 @@ build_script: -DCMAKE_TOOLCHAIN_FILE=C:/Tools/vcpkg/scripts/buildsystems/vcpkg.cmake -DUSE_BUNDLED_BOOST=OFF -DUSE_BUNDLED_JSON=OFF + -DMTX_STATIC=ON - cmake --build .deps --config Release # Build nheko @@ -104,8 +105,8 @@ after_build: # Copy installer data - copy %BUILD%\resources\nheko.ico installer\config - copy %BUILD%\resources\nheko.png installer\config - - copy %BUILD%\LICENSE installer\packages\com.mujx.nheko\meta\license.txt - - copy %BUILD%\LICENSE installer\packages\com.mujx.nheko.cleanup\meta\license.txt + - copy %BUILD%\COPYING installer\packages\com.mujx.nheko\meta\license.txt + - copy %BUILD%\COPYING installer\packages\com.mujx.nheko.cleanup\meta\license.txt - copy %BUILD%\deploy\installer\config.xml installer\config - copy %BUILD%\deploy\installer\controlscript.qs installer\config - copy %BUILD%\deploy\installer\uninstall.qs installer\packages\com.mujx.nheko\data diff --git a/deps/CMakeLists.txt b/deps/CMakeLists.txt index 84665010..f04bfbcc 100644 --- a/deps/CMakeLists.txt +++ b/deps/CMakeLists.txt @@ -30,6 +30,7 @@ option(USE_BUNDLED_LMDBXX "Use the bundled version of lmdbxx." ${USE_BUNDLED}) option(USE_BUNDLED_MATRIX_CLIENT "Use the bundled version of mtxclient." ${USE_BUNDLED}) option(USE_BUNDLED_JSON "Use the bundled version of nlohmann json." ${USE_BUNDLED}) +option(MTX_STATIC "Compile / link bundled mtx client statically" OFF) if(USE_BUNDLED_BOOST) # bundled boost is 1.68, which requires CMake 3.12 or greater. diff --git a/deps/cmake/MatrixClient.cmake b/deps/cmake/MatrixClient.cmake index b2c570ab..44992c0b 100644 --- a/deps/cmake/MatrixClient.cmake +++ b/deps/cmake/MatrixClient.cmake @@ -13,6 +13,12 @@ endif() # instead of the bundled version of Boost, like we wanted. set(BOOST_BUNDLE_ROOT "-DBOOST_ROOT=${DEPS_BUILD_DIR}/boost") +set (MTX_SHARED ON) + +if (MTX_STATIC) + set (MTX_SHARED OFF) +endif() + ExternalProject_Add( MatrixClient @@ -28,7 +34,7 @@ ExternalProject_Add( -DBUILD_LIB_EXAMPLES=OFF -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE} ${BOOST_BUNDLE_ROOT} - -DBUILD_SHARED_LIBS=${MTX_STATIC} + -DBUILD_SHARED_LIBS=${MTX_SHARED} ${PLATFORM_FLAGS} ${DEPS_BUILD_DIR}/mtxclient BUILD_COMMAND |