From da0130fdc7e005b2423b2450f066d9ef2a417d45 Mon Sep 17 00:00:00 2001 From: apo Date: Wed, 26 Dec 2012 16:48:14 +0000 Subject: [PATCH] advance 'bop' based build system --- SUIT.pro | 21 +++++++++++++++++++++ src/Common.pro | 14 +++++++------- 2 files changed, 28 insertions(+), 7 deletions(-) diff --git a/SUIT.pro b/SUIT.pro index a1be432be..34cd3ab5d 100644 --- a/SUIT.pro +++ b/SUIT.pro @@ -32,3 +32,24 @@ SUBDIRS = src/Qtx \ src/SVTK \ src/STD \ src/CAM + +#-------------------------------------------------------------------------------------- +unix { + install_binaries.files = $$(BIN_DIR) $$(LIB_DIR) + install_binaries.path = $$(TARGET_DIR)/$$(config_id) + INSTALLS *= install_binaries + + install_resources.files = $$(RES_DIR) + install_resources.path = $$(TARGET_DIR) + INSTALLS *= install_resources + + install_config_run.files = ./run.config/*.* + install_config_run.path = $$(TARGET_DIR) + INSTALLS *= install_config_run + + install_addons.files = $$(ROOT_DIR)/launcher_config.py $$(ROOT_DIR)/launcher_engine.py $$(ROOT_DIR)/launcher_env.py + install_addons.path = $$(TARGET_DIR) + INSTALLS *= install_addons +} + +#-------------------------------------------------------------------------------------- diff --git a/src/Common.pro b/src/Common.pro index 29e2104e3..5184de578 100644 --- a/src/Common.pro +++ b/src/Common.pro @@ -13,21 +13,21 @@ win32:QMAKE_MOC=$(QTDIR)\bin\moc.exe isEmpty( HEADERS ):HEADERS = *.h isEmpty( SOURCES ):SOURCES = *.cxx -MOC_DIR = ../../../tmp/$$(CONFIG_ID)/moc +MOC_DIR = $$(TMP_DIR)/moc unix { - OBJECTS_DIR = ../../../tmp/$$(CONFIG_ID)/obj + OBJECTS_DIR = $$(TMP_DIR)/obj contains( TEMPLATE, lib ) { - DESTDIR = ../../../SUIT/$(CONFIG_ID)/lib + DESTDIR = $(LIB_DIR) } else { - DESTDIR = ../../../SUIT/$(CONFIG_ID)/bin + DESTDIR = $(BIN_DIR) } - HEADERS_DIR = ../../../SUIT/$(CONFIG_ID)/include + HEADERS_DIR = $$(BUILD_DIR)/include INCLUDEPATH += $${HEADERS_DIR} - LIBS += -L../../../SUIT/$(CONFIG_ID)/lib + LIBS += -L$(LIB_DIR) - GUIResources = ../../../SUIT/$(CONFIG_ID)/resources + GUIResources = $(RES_DIR) includes.files = $$HEADERS includes.path = $${HEADERS_DIR} -- 2.39.2