advance 'bop' based build system

diff --git a/SUIT.pro b/SUIT.pro
index a1be432bee34d12d6d01fe43d06aef3339d28b2d..34cd3ab5d8a84772c17ea38f20708cfd19b14a8a 100644 (file)
--- 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 29e2104e34b440aadf82e82d7d1060dc7100ab5a..5184de5782444516bbf808808f3d5bee4b67297c 100644 (file)
--- 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}