diff --git a/Makefile b/Makefile new file mode 100644 index 0000000000000000000000000000000000000000..f0847e4a6c5c653a068e8e268ceff13913ef81b8 --- /dev/null +++ b/Makefile @@ -0,0 +1,24 @@ +# Makefile + +# Get the current working directory +CURRENT_DIR := $(shell pwd) + +TMP_INSTALL_DIR=$(CURRENT_DIR)/tmp-install-dir +PREFIX ?= /runtime +CUMBIA_ROOT ?= /runtime +MKF_OUT=Makefile.qmake + +export MAKE := $(MAKE) +# The default target when you run 'make' +all: + @qmake INSTALL_ROOT=$(TMP_INSTALL_DIR) prefix=$(PREFIX) -o $(MKF_OUT) && $(MAKE) -f $(MKF_OUT) \ + && $(MAKE) -f $(MKF_OUT) install + +# The target when you run 'make install' +install: + @echo "[ Makefile ] installing from $(TMP_INSTALL_DIR) to $(PREFIX)" + @mkdir -p $(PREFIX) + @cp -rv $(TMP_INSTALL_DIR)/* $(PREFIX) + +clean: + @rm -rf objs obj moc $(MKF_OUT) lib*.so.* diff --git a/Makefile.INAU b/Makefile.INAU new file mode 100644 index 0000000000000000000000000000000000000000..f0847e4a6c5c653a068e8e268ceff13913ef81b8 --- /dev/null +++ b/Makefile.INAU @@ -0,0 +1,24 @@ +# Makefile + +# Get the current working directory +CURRENT_DIR := $(shell pwd) + +TMP_INSTALL_DIR=$(CURRENT_DIR)/tmp-install-dir +PREFIX ?= /runtime +CUMBIA_ROOT ?= /runtime +MKF_OUT=Makefile.qmake + +export MAKE := $(MAKE) +# The default target when you run 'make' +all: + @qmake INSTALL_ROOT=$(TMP_INSTALL_DIR) prefix=$(PREFIX) -o $(MKF_OUT) && $(MAKE) -f $(MKF_OUT) \ + && $(MAKE) -f $(MKF_OUT) install + +# The target when you run 'make install' +install: + @echo "[ Makefile ] installing from $(TMP_INSTALL_DIR) to $(PREFIX)" + @mkdir -p $(PREFIX) + @cp -rv $(TMP_INSTALL_DIR)/* $(PREFIX) + +clean: + @rm -rf objs obj moc $(MKF_OUT) lib*.so.* diff --git a/Makefile.cmake b/Makefile.cmake new file mode 100644 index 0000000000000000000000000000000000000000..be637fb599042debab16ff48f4cd5cc79bb71257 --- /dev/null +++ b/Makefile.cmake @@ -0,0 +1,31 @@ +# Makefile + +# Get the current working directory +CURRENT_DIR := $(shell pwd) + +# Set default values for build_dir and install_prefix +BUILD_DIR := $(CURRENT_DIR)/build +TMP_INSTALL_DIR=$(CURRENT_DIR)/tmp-install-dir +PREFIX ?= /runtime +export MAKE := $(MAKE) +# The default target when you run 'make' +all: + @echo "[ Makefile ] build_dir=$(BUILD_DIR) install_prefix=$(PREFIX) jobs $(JOBS)" + mkdir -p $(BUILD_DIR); \ + cd $(BUILD_DIR) && cmake .. -DCMAKE_INSTALL_PREFIX=$(TMP_INSTALL_DIR) -DCMAKE_PREFIX_PATH=$(PREFIX)/lib -DCMAKE_MODULE_PATH=$(PREFIX)/lib/cmake && $(MAKE) && $(MAKE) install + +# The target when you run 'make install' +install: + @echo "[ Makefile ] installing from $(TMP_INSTALL_DIR) to $(PREFIX)" + @mkdir -p $(PREFIX) + @cp -rv $(TMP_INSTALL_DIR)/* $(PREFIX) + +# Set the build_dir and install_prefix from the command line if provided +# Example: make build_dir=/custom/build install_prefix=/custom/install install +build: + @echo "[ Makefile ] build_dir=$(BUILD_DIR) and install_prefix=$(PREFIX)" + mkdir -p $(BUILD_DIR); \ + cd $(BUILD_DIR) && cmake .. -DCMAKE_INSTALL_PREFIX=$(TMP_INSTALL_DIR) && $(MAKE) && $(MAKE) install + + + diff --git a/cumbia-dbus-plugin.pro b/cumbia-dbus-plugin.pro index 0ef816d888892ead16375f954629f9696add77e3..5becc147897892f08fe27a22fc4164ca958a1446 100644 --- a/cumbia-dbus-plugin.pro +++ b/cumbia-dbus-plugin.pro @@ -1,22 +1,70 @@ -# $Id: dbus.pro,v 1.9 2014-08-28 13:23:45 giacomo Exp $ -# $Name $ +isEmpty(INSTALL_ROOT) { + INSTALL_ROOT = /usr/local/cumbia-libs +} -exists(../qumbia-plugins.pri/qumbia-plugins.pri) { - include(../qumbia-plugins.pri/qumbia-plugins.pri) -} else { - message("*") - message("* download qumbia-plugins.pri project into parent directory") - message("*") - message("> git clone https://gitlab.elettra.eu/cs/lib/cumbia/qumbia-plugins.pri ../qumbia-plugins.pri") - message("*") - error("* missing ../qumbia-plugins.pri/qumbia-plugins.pri file") +isEmpty(prefix) { + prefix = $${INSTALL_ROOT} } -include ($${INSTALL_ROOT}/include/cumbia-qtcontrols/cumbia-qtcontrols.pri) +isEmpty(CUMBIA_ROOT) { + CUMBIA_ROOT=$${prefix} +} +include ($${CUMBIA_ROOT}/include/cumbia-qtcontrols/cumbia-qtcontrols.pri) + +isEmpty(INSTALL_ROOT) { + INSTALL_ROOT = /usr/local/cumbia-libs +} + +MAKEFILE=Makefile.qmake TEMPLATE = lib CONFIG += plugin +QT += core gui + +QUMBIA_PLUGINS_INCLUDES=$${INSTALL_ROOT}/include/qumbia-plugins +QUMBIA_PLUGINS_SHARE=$${INSTALL_ROOT}/share/qumbia-plugins +QUMBIA_PLUGINS_LIBDIR=$${INSTALL_ROOT}/lib/qumbia-plugins +QUMBIA_PLUGINS_DOCDIR=$${INSTALL_ROOT}/share/doc/qumbia-plugins + +INC_DIR = $${QUMBIA_PLUGINS_INCLUDES} +SHAREDIR = $${QUMBIA_PLUGINS_SHARE} +PLUGIN_LIB_DIR = $${QUMBIA_PLUGINS_LIBDIR} + +DESTDIR = plugins + +unix:!android-g++ { + DEFINES += CUMBIAQTCONTROLS_HAS_QWT=1 +} + +DOC_DIR = $${QUMBIA_PLUGINS_DOCDIR} + +!isEmpty(docs) { + doc.commands = \ + doxygen \ + Doxyfile; + doc.files = doc/* + doc.path = $${DOC_DIR} + + QMAKE_EXTRA_TARGETS += doc + INSTALLS += doc +} +else { + message("call qmake docs=1 to generate and install docs") +} + +target.path = $${PLUGIN_LIB_DIR} +inc.path = $${INC_DIR} + +INSTALLS += target inc + +DEFINES_QUMBIA_PLUGINS_LIBDIR = $${prefix}/lib/qumbia-plugins + +# added by cumbia-qtcontrols.pri, not included by this file +# +DEFINES += \ + CUMBIA_QTCONTROLS_PLUGIN_DIR=\"\\\"$${DEFINES_QUMBIA_PLUGINS_LIBDIR}\\\"\" \ + isEmpty(buildtype) { buildtype = release @@ -27,7 +75,9 @@ isEmpty(buildtype) { message("") } } -CONFIG += $${buildtype} + + +CONFIG += $${buildtype} plugin QT += dbus xml @@ -56,7 +106,3 @@ inc.files += $${HEADERS} cumbiadbus_interface.h DISTFILES += \ quapplication.xml - -# qumbia-plugins.pri defines default INSTALLS for target inc and doc -# doc commands, target.path and inc.path are defined there as well. -