adam/znc
1
0
Fork 0
mirror of https://github.com/znc/znc.git synced 2026-08-07 17:33:34 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix CMake build:

Browse Source 
* VERSION_EXTRA is now supported
* znc-buildmod uses the correct ZNC library instead of one in /usr/share
This commit is contained in:
Alexey Sokolov
2017-02-28 20:01:02 +00:00
parent 74bfbea6f2
commit 88d1e27cc6
5 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/integration/main.cpp
+6 -3
View File
@@ -318,7 +318,8 @@ class ZNCTest : public testing::Test {
out << content;
file.close();
Process p(
ZNC_BIN_DIR "/znc-buildmod", QStringList() << file.fileName(),
ZNC_BIN_DIR "/znc-buildmod",
QStringList() << "--verbose" << file.fileName(),
[&](QProcess* proc) {
proc->setWorkingDirectory(dir.absolutePath());
proc->setProcessChannelMode(QProcess::ForwardedChannels);
@@ -1874,7 +1875,8 @@ TEST_F(ZNCTest, BuildMod) {
EXPECT_TRUE(dir.cd("modules"));
{
Process p(ZNC_BIN_DIR "/znc-buildmod",
QStringList() << srcdir.filePath("file-not-found.cpp"),
QStringList() << "--verbose"
<< srcdir.filePath("file-not-found.cpp"),
[&](QProcess* proc) {
proc->setWorkingDirectory(dir.absolutePath());
proc->setProcessChannelMode(QProcess::ForwardedChannels);
@@ -1883,7 +1885,8 @@ TEST_F(ZNCTest, BuildMod) {
}
{
Process p(ZNC_BIN_DIR "/znc-buildmod",
QStringList() << srcdir.filePath("testmod.cpp"),
QStringList() << "--verbose"
<< srcdir.filePath("testmod.cpp"),
[&](QProcess* proc) {
proc->setWorkingDirectory(dir.absolutePath());
proc->setProcessChannelMode(QProcess::ForwardedChannels);