diff options
| author | Thiago Marcos P. Santos <thiago@mapbox.com> | 2020-04-29 16:43:43 +0300 |
|---|---|---|
| committer | Thiago Marcos P. Santos <thiago@mapbox.com> | 2020-05-26 20:35:03 +0300 |
| commit | 95c80287d280883328c614bbf0c8013d71be37d5 (patch) | |
| tree | ae43b758328912b3500c796ba9140bfaaa14054d | |
| parent | 0636e102ff93ad04901977d9aec19538b3ae1527 (diff) | |
| download | qtlocation-mapboxgl-95c80287d280883328c614bbf0c8013d71be37d5.tar.gz | |
[build] Place binaries at /bin and libraries at /lib
A lot easier to find them.
| -rw-r--r-- | CMakeLists.txt | 6 | ||||
| -rw-r--r-- | circle.yml | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index b84be3d4c3..58796e8b16 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -28,6 +28,12 @@ option(MBGL_WITH_RTTI "Compile with runtime type information" OFF) option(MBGL_WITH_OPENGL "Build with OpenGL renderer" ON) option(MBGL_WITH_WERROR "Make all compilation warnings errors" ON) +if(CMAKE_SYSTEM_NAME STREQUAL Linux OR CMAKE_SYSTEM_NAME STREQUAL Darwin) + set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib) + set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib) + set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) +endif() + add_library( mbgl-compiler-options INTERFACE ) diff --git a/circle.yml b/circle.yml index 7cab7608b8..c205811f43 100644 --- a/circle.yml +++ b/circle.yml @@ -318,7 +318,7 @@ commands: - run: name: << parameters.step_name >> command: | - build/mbgl-render-test-runner << parameters.metrics_params >> + build/bin/mbgl-render-test-runner << parameters.metrics_params >> save: steps: - save_cache: |