From 801dec04afea0c5c46540b074fecdff7195caf5f Mon Sep 17 00:00:00 2001
From: wsnipex <wsnipex@a1.net>
Date: Wed, 2 Dec 2015 20:20:47 +0100
Subject: [cmake] fix package-addon (zip) target on linux

---
 project/cmake/addons/CMakeLists.txt              | 2 +-
 project/cmake/scripts/common/addon-helpers.cmake | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

(limited to 'project')

diff --git a/project/cmake/addons/CMakeLists.txt b/project/cmake/addons/CMakeLists.txt
index de60ad7610..00db97d8de 100644
--- a/project/cmake/addons/CMakeLists.txt
+++ b/project/cmake/addons/CMakeLists.txt
@@ -385,7 +385,7 @@ foreach(addon ${addons})
 
           # create a forwarding target to the addon-package target
           add_custom_target(package-${id}
-                    COMMAND ${CMAKE_COMMAND} --build ${BUILD_DIR}/${id}-prefix/src/${id}-build --target addon-package
+                    COMMAND ${CMAKE_COMMAND} --build ${id}-prefix/src/${id}-build --target addon-package
                     DEPENDS ${id})
           add_dependencies(package-addons package-${id})
 
diff --git a/project/cmake/scripts/common/addon-helpers.cmake b/project/cmake/scripts/common/addon-helpers.cmake
index c3f52e1235..9541df475e 100644
--- a/project/cmake/scripts/common/addon-helpers.cmake
+++ b/project/cmake/scripts/common/addon-helpers.cmake
@@ -111,6 +111,9 @@ macro (build_addon target prefix libs)
                 COMPONENT ${target}-${${prefix}_VERSION})
       ENDIF()
     ELSE(WIN32)
+      if(NOT CPACK_PACKAGE_DIRECTORY)
+        set(CPACK_PACKAGE_DIRECTORY ${CMAKE_BINARY_DIR})
+      endif()
       INSTALL(TARGETS ${target} DESTINATION ${target}
               COMPONENT ${target}-${${prefix}_VERSION})
     ENDIF(WIN32)
-- 
cgit v1.2.3