mirror of
https://github.com/savoirfairelinux/jami-client-qt.git
synced 2025-12-18 08:35:26 +08:00
packaging: fix Linux build
GitLab: #2090 Change-Id: I7621264bebb683ed06294d9bee0bf15bddf3f0cd
This commit is contained in:
@@ -58,10 +58,8 @@ else()
|
|||||||
set(DAEMON_DIR ${PROJECT_SOURCE_DIR}/daemon)
|
set(DAEMON_DIR ${PROJECT_SOURCE_DIR}/daemon)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
# For now only MSVC is supported for building Jami-core within the
|
|
||||||
# client cmake.
|
|
||||||
if(JAMICORE_AS_SUBDIR)
|
if(JAMICORE_AS_SUBDIR)
|
||||||
add_subdirectory(${DAEMON_DIR})
|
add_subdirectory(${DAEMON_DIR} EXCLUDE_FROM_ALL)
|
||||||
set(LIBJAMI_LIB jami-core)
|
set(LIBJAMI_LIB jami-core)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
|||||||
@@ -95,6 +95,7 @@ override_dh_auto_build:
|
|||||||
-DCMAKE_INSTALL_PREFIX=/usr \
|
-DCMAKE_INSTALL_PREFIX=/usr \
|
||||||
-DLIBJAMI_BUILD_DIR=$(CURDIR)/daemon/src \
|
-DLIBJAMI_BUILD_DIR=$(CURDIR)/daemon/src \
|
||||||
-DENABLE_LIBWRAP=true \
|
-DENABLE_LIBWRAP=true \
|
||||||
|
-DBUILD_TESTING=Off \
|
||||||
$(CMAKE_OPTIONS) ..
|
$(CMAKE_OPTIONS) ..
|
||||||
make -C build -j$(NO_CPUS) VERBOSE=1
|
make -C build -j$(NO_CPUS) VERBOSE=1
|
||||||
|
|
||||||
|
|||||||
@@ -75,6 +75,7 @@ cd %{_builddir}/jami-%{version} && \
|
|||||||
-DCMAKE_BUILD_TYPE=Release \
|
-DCMAKE_BUILD_TYPE=Release \
|
||||||
-DBUILD_VERSION=${BUILD_VERSION} \
|
-DBUILD_VERSION=${BUILD_VERSION} \
|
||||||
-DCMAKE_PREFIX_PATH=%{QT_JAMI_PREFIX} \
|
-DCMAKE_PREFIX_PATH=%{QT_JAMI_PREFIX} \
|
||||||
|
-DBUILD_TESTING=Off \
|
||||||
..
|
..
|
||||||
make -C %{_builddir}/jami-%{version}/build %{_smp_mflags} VERBOSE=1
|
make -C %{_builddir}/jami-%{version}/build %{_smp_mflags} VERBOSE=1
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user