From 865e3b3f136b9113620671197817427f548b52b1 Mon Sep 17 00:00:00 2001 From: Philippe Renon Date: Sat, 12 Sep 2015 18:18:55 +0200 Subject: [PATCH] LP-29 fixed osgearth copydata.pro for linux --- ground/gcs/src/libs/osgearth/copydata.pro | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/ground/gcs/src/libs/osgearth/copydata.pro b/ground/gcs/src/libs/osgearth/copydata.pro index 9d22738bd..34959bf03 100644 --- a/ground/gcs/src/libs/osgearth/copydata.pro +++ b/ground/gcs/src/libs/osgearth/copydata.pro @@ -7,19 +7,24 @@ equals(copyosg, 1) { linux { # copy osg libraries + + data_copy.commands += $(MKDIR) $${GCS_LIBRARY_PATH}/osg $$addNewline() exists( $${OSG_SDK_DIR}/lib64 ) { - #addCopyDirFilesTargets($${OSG_SDK_DIR}/lib64,$${GCS_LIBRARY_PATH}/osg) - } else { - #addCopyDirFilesTargets($${OSG_SDK_DIR}/lib,$${GCS_LIBRARY_PATH}/osg) + data_copy.commands += $(COPY_DIR) $${OSG_SDK_DIR}/lib64/* $${GCS_LIBRARY_PATH}/osg/ $$addNewline() } + else { + data_copy.commands += $(COPY_DIR) $${OSG_SDK_DIR}/lib/* $${GCS_LIBRARY_PATH}/osg/ $$addNewline() + } + + # add make target + POST_TARGETDEPS += copydata + + data_copy.target = copydata + QMAKE_EXTRA_TARGETS += data_copy } macx { - isEmpty(PROVIDER) { - PROVIDER = OpenPilot - } - data_copy.commands += $(COPY_DIR) $$targetPath(\"$$OSG_SDK_DIR/lib/\"*) $$targetPath(\"$$GCS_LIBRARY_PATH\") $$addNewline() # add make target