From 37de61cac7ce5c86752b5ea0cdfa2da3d8e5a2dc Mon Sep 17 00:00:00 2001
From: Rashad Kanavath <rashad.kanavath@c-s.fr>
Date: Fri, 29 Apr 2016 17:45:11 +0200
Subject: [PATCH] PKG: BUG: incorrect set in set(archive_name
---
SuperBuild/Packaging/PMacros.cmake | 8 ++++----
SuperBuild/Packaging/PackageHelper.cmake | 1 +
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/SuperBuild/Packaging/PMacros.cmake b/SuperBuild/Packaging/PMacros.cmake
index 823c4c9ab8..c393138f88 100644
--- a/SuperBuild/Packaging/PMacros.cmake
+++ b/SuperBuild/Packaging/PMacros.cmake
@@ -7,9 +7,9 @@ macro(macro_setup_cmake_sources pkg)
execute_process(COMMAND ${CMAKE_COMMAND} -E make_directory "${PACKAGE_PROJECT_DIR}/build")
if("${pkg}" STREQUAL "XDK")
- set(${archive_name} ${PACKAGE_NAME}-${PACKAGE_VERSION_STRING}-xdk-${PACKAGE_PLATFORM_NAME}${PACKAGE_ARCH})
+ set(archive_name ${PACKAGE_NAME}-${PACKAGE_VERSION_STRING}-xdk-${PACKAGE_PLATFORM_NAME}${PACKAGE_ARCH})
else()
- set(${archive_name} ${PACKAGE_NAME}-${PACKAGE_VERSION_STRING}-${PACKAGE_PLATFORM_NAME}${PACKAGE_ARCH})
+ set(archive_name ${PACKAGE_NAME}-${PACKAGE_VERSION_STRING}-${PACKAGE_PLATFORM_NAME}${PACKAGE_ARCH})
endif()
if("${pkg}" STREQUAL "XDK")
@@ -74,9 +74,9 @@ macro(macro_create_targets_for_package pkg)
set(PACKAGE_PROJECT_DIR ${CMAKE_BINARY_DIR}/PACKAGE-${pkg})
if("${pkg}" STREQUAL "XDK")
- set(${archive_name} ${PACKAGE_NAME}-${PACKAGE_VERSION_STRING}-xdk-${PACKAGE_PLATFORM_NAME}${PACKAGE_ARCH})
+ set(archive_name ${PACKAGE_NAME}-${PACKAGE_VERSION_STRING}-xdk-${PACKAGE_PLATFORM_NAME}${PACKAGE_ARCH})
else()
- set(${archive_name} ${PACKAGE_NAME}-${PACKAGE_VERSION_STRING}-${PACKAGE_PLATFORM_NAME}${PACKAGE_ARCH})
+ set(archive_name ${PACKAGE_NAME}-${PACKAGE_VERSION_STRING}-${PACKAGE_PLATFORM_NAME}${PACKAGE_ARCH})
endif()
#configure
diff --git a/SuperBuild/Packaging/PackageHelper.cmake b/SuperBuild/Packaging/PackageHelper.cmake
index 8e2bdc5462..fc8bda5206 100644
--- a/SuperBuild/Packaging/PackageHelper.cmake
+++ b/SuperBuild/Packaging/PackageHelper.cmake
@@ -1,5 +1,6 @@
macro(super_package)
cmake_parse_arguments(PKG "" "STAGE_DIR" "SEARCHDIRS" ${ARGN} )
+
set(loader_program_PATHS)
if(WIN32 OR CMAKE_CROSSCOMPILING)
set(loader_program_names "${MXE_ARCH}-w64-mingw32.shared-objdump")
--
GitLab