Fix CMake build:

* 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
+2 -1
View File
@@ -13,7 +13,8 @@
// Don't use this one
#define VERSION (VERSION_MAJOR + VERSION_MINOR / 10.0)
// You can add -DVERSION_EXTRA="stuff" to your CXXFLAGS!
// autoconf: You can add -DVERSION_EXTRA="stuff" to your CXXFLAGS!
// CMake: You can add -DVERSION_EXTRA=stuff to cmake!
#ifndef VERSION_EXTRA
#define VERSION_EXTRA ""
#endif
+1
View File
@@ -23,6 +23,7 @@
#define VERSION_MINOR @PROJECT_VERSION_MINOR@
#define VERSION_PATCH @PROJECT_VERSION_PATCH@
#define VERSION_STR "@PROJECT_VERSION@"
#define VERSION_EXTRA "@VERSION_EXTRA@"
#cmakedefine _GLIBCXX_DEBUG 1
#cmakedefine _GLIBCXX_DEBUG_PEDANTIC 1