packaging: integrate CPACK_PACKAGE_RELEASE cmake variable and reformat
@@ -39,14 +39,14 @@ CMAKE_ARGS_BASE="-DTARGET_PLUGIN_FOLDER='elektra4' \
-DBUILD_PDF=OFF \
-DBUILD_FULL=ON \
-DTARGET_DOCUMENTATION_HTML_FOLDER=share/doc/libelektra-doc/html \
- -DTARGET_TEST_DATA_FOLDER=share/libelektra-test/test-data"
+ -DTARGET_TEST_DATA_FOLDER=share/libelektra-test/test-data \
+ -DCPACK_PACKAGE_RELEASE=$PACKAGE_REVISION"
if [ "$DIST_NAME" = "Fedora" ]; then
CMAKE_ARGS_SPECIFIC="-DTARGET_LUA_CMOD_FOLDER=lib$LUA_LIB_SUFFIX/lua/$LUA_VERSION \
-DTARGET_LUA_LMOD_FOLDER=share/lua/$LUA_VERSION \
- -DSWIG_EXECUTABLE=/usr/bin/swig \
- -DCPACK_RPM_PACKAGE_RELEASE=$PACKAGE_REVISION"
+ -DSWIG_EXECUTABLE=/usr/bin/swig"
else
PY3VER=$(py3versions -d -v)
@@ -63,8 +63,7 @@ else
-DCMAKE_CXX_FLAGS=$CXXFLAGS \
-DCMAKE_EXE_LINKER_FLAGS=$LDFLAGS \
-DCMAKE_MODULE_LINKER_FLAGS=$LDFLAGS \
- -DCMAKE_SHARED_LINKER_FLAGS=$LDFLAGS \
- -DCPACK_DEBIAN_PACKAGE_RELEASE=$PACKAGE_REVISION"
+ -DCMAKE_SHARED_LINKER_FLAGS=$LDFLAGS"
fi
cmake $CMAKE_ARGS_BASE $CMAKE_ARGS_SPECIFIC ..
