Install

9 files changed, 27 insertions, 0 deletions

diff --git a/next/CMakeLists.txt b/next/CMakeLists.txt
index df56f04b22..c38cd9e202 100644
--- a/next/CMakeLists.txt
+++ b/next/CMakeLists.txt
@@ -39,6 +39,9 @@ if(MBGL_WITH_QT)
     set(CMAKE_AUTORCC ON)
 endif()
 
+# Install on [bin,lib,...]
+include(GNUInstallDirs)
+
 # Avoid warnings when setting visibility
 cmake_policy(SET CMP0063 NEW)
 
diff --git a/next/benchmark/CMakeLists.txt b/next/benchmark/CMakeLists.txt
index 2ae1227d91..65b4b7e955 100644
--- a/next/benchmark/CMakeLists.txt
+++ b/next/benchmark/CMakeLists.txt
@@ -39,3 +39,5 @@ if(CMAKE_SYSTEM_NAME STREQUAL Android)
 endif()
 
 set_property(TARGET mbgl-benchmark PROPERTY FOLDER Core)
+
+install(TARGETS mbgl-benchmark LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
diff --git a/next/bin/CMakeLists.txt b/next/bin/CMakeLists.txt
index e4222774bb..73a20a8dd9 100644
--- a/next/bin/CMakeLists.txt
+++ b/next/bin/CMakeLists.txt
@@ -18,6 +18,8 @@ target_link_libraries(
     PRIVATE Mapbox::Base::Extras::args mbgl-core
 )
 
+install(TARGETS mbgl-offline mbgl-render RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+
 # FIXME: CI must have a valid token
 #
 # add_test(NAME mbgl-offline-tool-test COMMAND mbgl-offline -s mapbox://styles/mapbox/satellite-v9 --maxZoom=0 WORKING_DIRECTORY
diff --git a/next/expression-test/CMakeLists.txt b/next/expression-test/CMakeLists.txt
index f7d694b054..e65523a284 100644
--- a/next/expression-test/CMakeLists.txt
+++ b/next/expression-test/CMakeLists.txt
@@ -36,3 +36,5 @@ set_property(TARGET mbgl-expression-test PROPERTY FOLDER Executables)
 string(RANDOM LENGTH 5 ALPHABET 0123456789 MBGL_EXPRESSION_TEST_SEED)
 
 add_test(NAME mbgl-expression-test COMMAND mbgl-expression-test -s --seed=${MBGL_EXPRESSION_TEST_SEED} WORKING_DIRECTORY ${MBGL_ROOT})
+
+install(TARGETS mbgl-expression-test RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
diff --git a/next/platform/android/android.cmake b/next/platform/android/android.cmake
index 1bde72d11d..c36e9d338e 100644
--- a/next/platform/android/android.cmake
+++ b/next/platform/android/android.cmake
@@ -307,3 +307,13 @@ target_compile_options(mapbox-gl PRIVATE $<$<CONFIG:Release>:-Qunused-arguments
 target_compile_options(mbgl-core PRIVATE $<$<CONFIG:Release>:-Qunused-arguments -flto>)
 target_compile_options(mbgl-vendor-icu PRIVATE $<$<CONFIG:Release>:-Qunused-arguments -flto>)
 target_compile_options(mbgl-vendor-sqlite PRIVATE $<$<CONFIG:Release>:-Qunused-arguments -flto>)
+
+install(
+    TARGETS
+        example-custom-layer
+        mapbox-gl
+        mbgl-benchmark-runner
+        mbgl-test-runner
+    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+)
diff --git a/next/platform/glfw/CMakeLists.txt b/next/platform/glfw/CMakeLists.txt
index d4f1b9d545..b20b05302a 100644
--- a/next/platform/glfw/CMakeLists.txt
+++ b/next/platform/glfw/CMakeLists.txt
@@ -36,3 +36,5 @@ target_link_libraries(
 )
 
 set_property(TARGET mbgl-glfw PROPERTY FOLDER Executables)
+
+install(TARGETS mbgl-glfw RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
diff --git a/next/platform/linux/linux.cmake b/next/platform/linux/linux.cmake
index 18531a2856..e6cd2de0c2 100644
--- a/next/platform/linux/linux.cmake
+++ b/next/platform/linux/linux.cmake
@@ -124,3 +124,5 @@ target_link_libraries(
 
 add_test(NAME mbgl-benchmark-runner COMMAND mbgl-benchmark-runner WORKING_DIRECTORY ${MBGL_ROOT})
 add_test(NAME mbgl-test-runner COMMAND mbgl-test-runner WORKING_DIRECTORY ${MBGL_ROOT})
+
+install(TARGETS mbgl-benchmark-runner mbgl-test-runner RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
diff --git a/next/render-test/CMakeLists.txt b/next/render-test/CMakeLists.txt
index 1a4cd5ceb6..256c5d1cf1 100644
--- a/next/render-test/CMakeLists.txt
+++ b/next/render-test/CMakeLists.txt
@@ -53,3 +53,5 @@ add_test(
 
 add_test(NAME mbgl-render-test-probes COMMAND mbgl-render-test tests --rootPath=render-test WORKING_DIRECTORY ${MBGL_ROOT})
 add_test(NAME mbgl-query-test COMMAND mbgl-render-test query-tests WORKING_DIRECTORY ${MBGL_ROOT})
+
+install(TARGETS mbgl-render-test RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
diff --git a/next/test/CMakeLists.txt b/next/test/CMakeLists.txt
index 586e2bbdaa..a769a36b8b 100644
--- a/next/test/CMakeLists.txt
+++ b/next/test/CMakeLists.txt
@@ -165,3 +165,5 @@ if(CMAKE_SYSTEM_NAME STREQUAL Android)
 endif()
 
 set_property(TARGET mbgl-test PROPERTY FOLDER Core)
+
+install(TARGETS mbgl-test LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})