diff options
| author |   Damjan Marion <damarion@cisco.com> | 2020-06-16 16:05:12 +0200 |
|---|---|---|
| committer |   Matthew Smith <mgsmith@netgate.com> | 2020-06-17 00:46:35 +0000 |
| commit | 5857daf4326e647f29b31e9f3ca9b794a447d5e4 (patch) | |
| tree | 55075e65a2cd4aeaac35098a149d8d46ddf49dca | |
| parent | ae45d4789938ccd43a2967b528af3c5d4b6ee63e (diff) | |
build: cmake cross-compilation fixes
Type: fix
Change-Id: I40337c208375b74b4dc3c35102c5e66a6e4568e8
Signed-off-by: Damjan Marion <damarion@cisco.com>
| -rw-r--r-- | src/cmake/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/pkg/CMakeLists.txt | 4 |
2 files changed, 5 insertions, 1 deletions
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}") |