diff options
| author | wsnipex <wsnipex@a1.net> | 2015-12-02 20:20:47 +0100 |
|---|---|---|
| committer | wsnipex <wsnipex@a1.net> | 2015-12-02 20:28:33 +0100 |
| commit | 801dec04afea0c5c46540b074fecdff7195caf5f (patch) | |
| tree | 90200599bd10bc90849d24d8c912a46840d3b5af /project | |
| parent | 6bcc4db1129fd65a3d97c9fa9a39437839622985 (diff) | |
[cmake] fix package-addon (zip) target on linux
Diffstat (limited to 'project')
| -rw-r--r-- | project/cmake/addons/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | project/cmake/scripts/common/addon-helpers.cmake | 3 |
2 files changed, 4 insertions, 1 deletions
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) |