From: Damjan Marion <damarion@cisco.com>
Date: Tue, 16 Jun 2020 14:05:12 +0000 (+0200)
Subject: build: cmake cross-compilation fixes
X-Git-Tag: v21.01-rc0~271
X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F77%2F27577%2F2;p=vpp.git

build: cmake cross-compilation fixes

Type: fix
Change-Id: I40337c208375b74b4dc3c35102c5e66a6e4568e8
Signed-off-by: Damjan Marion <damarion@cisco.com>
---

diff --git a/src/cmake/CMakeLists.txt b/src/cmake/CMakeLists.txt
index fdee40c61c1..74cd385a1ce 100644
--- a/src/cmake/CMakeLists.txt
+++ b/src/cmake/CMakeLists.txt
@@ -21,7 +21,7 @@ install(
   VPPConfig.cmake
 
   DESTINATION
-  lib/cmake/vpp
+  ${VPP_LIBRARY_DIR}/cmake/vpp
 
   COMPONENT vpp-dev
 )
diff --git a/src/pkg/CMakeLists.txt b/src/pkg/CMakeLists.txt
index a5a0ffe5827..0e4b6dbcce7 100644
--- a/src/pkg/CMakeLists.txt
+++ b/src/pkg/CMakeLists.txt
@@ -11,6 +11,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+if(CMAKE_CROSSCOMPILING)
+  return()
+endif()
+
 get_cmake_property(VPP_COMPONENTS COMPONENTS)
 string(REPLACE ";" " " VPP_COMPONENTS "${VPP_COMPONENTS}")