commit 5857daf4326e647f29b31e9f3ca9b794a447d5e4
author Damjan Marion <damarion@cisco.com> Tue Jun 16 16:05:12 2020 +0200
committer Matthew Smith <mgsmith@netgate.com> Wed Jun 17 00:46:35 2020 +0000
tree 55075e65a2cd4aeaac35098a149d8d46ddf49dca
parent ae45d4789938ccd43a2967b528af3c5d4b6ee63e

build: cmake cross-compilation fixes

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

src/cmake/CMakeLists.txt

diff --git a/src/cmake/CMakeLists.txt b/src/cmake/CMakeLists.txt
index fdee40c..74cd385 100644
--- a/src/cmake/CMakeLists.txt
+++ b/src/cmake/CMakeLists.txt
@@ -21,7 +21,7 @@
   VPPConfig.cmake
 
   DESTINATION
-  lib/cmake/vpp
+  ${VPP_LIBRARY_DIR}/cmake/vpp
 
   COMPONENT vpp-dev
 )

src/pkg/CMakeLists.txt

diff --git a/src/pkg/CMakeLists.txt b/src/pkg/CMakeLists.txt
index a5a0ffe..0e4b6db 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}")