You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@celix.apache.org by pn...@apache.org on 2019/10/14 11:08:01 UTC

[celix] branch develop updated: Updates CMake bundle packaging for better support for cross compilation.

This is an automated email from the ASF dual-hosted git repository.

pnoltes pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/celix.git


The following commit(s) were added to refs/heads/develop by this push:
     new 6a3b51d  Updates CMake bundle packaging for better support for cross compilation.
6a3b51d is described below

commit 6a3b51d039c8d971f23f70618b291463cac630ed
Author: Pepijn Noltes <pe...@gmail.com>
AuthorDate: Mon Oct 14 13:06:47 2019 +0200

    Updates CMake bundle packaging for better support for cross compilation.
---
 cmake/cmake_celix/BundlePackaging.cmake | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cmake/cmake_celix/BundlePackaging.cmake b/cmake/cmake_celix/BundlePackaging.cmake
index 4118847..f0f81b8 100644
--- a/cmake/cmake_celix/BundlePackaging.cmake
+++ b/cmake/cmake_celix/BundlePackaging.cmake
@@ -15,12 +15,12 @@
 # specific language governing permissions and limitations
 # under the License.
 
-find_program(JAR_COMMAND jar)
+find_program(JAR_COMMAND jar NO_CMAKE_FIND_ROOT_PATH)
 
 if(JAR_COMMAND)
     message(STATUS "Using jar to create bundles")
 else()
-    find_program(ZIP_COMMAND zip)
+    find_program(ZIP_COMMAND zip NO_CMAKE_FIND_ROOT_PATH)
     if(ZIP_COMMAND)
         message(STATUS "Using zip to create bundles")
     else()