tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[build] Fix test linking for MacOS and Qt

Browse Source
This commit is contained in:
Juha Alanen
2020-01-24 11:07:15 +02:00
parent f2845990bb
commit eb9d0067ca
2 changed files with 29 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
next/platform/macos/macos.cmake
View File

@@ -165,6 +165,11 @@ add_executable(
${MBGL_ROOT}/platform/default/src/mbgl/test/main.cpp
)
target_include_directories(
mbgl-test-runner
PUBLIC ${MBGL_ROOT}/include ${MBGL_ROOT}/test/include
)
target_compile_definitions(
mbgl-test-runner
PRIVATE WORK_DIRECTORY=${MBGL_ROOT}
@@ -172,7 +177,7 @@ target_compile_definitions(
target_link_libraries(
mbgl-test-runner
PRIVATE mbgl-compiler-options mbgl-test
PRIVATE mbgl-compiler-options -Wl,-force_load mbgl-test
)
add_executable(
@@ -180,9 +185,14 @@ add_executable(
${MBGL_ROOT}/platform/default/src/mbgl/benchmark/main.cpp
)
target_include_directories(
mbgl-benchmark-runner
PUBLIC ${MBGL_ROOT}/benchmark/include
)
target_link_libraries(
mbgl-benchmark-runner
PRIVATE mbgl-compiler-options mbgl-benchmark
PRIVATE mbgl-compiler-options -Wl,-force_load mbgl-benchmark
)
add_executable(

18
next/platform/qt/qt.cmake
View File

@@ -165,6 +165,11 @@ add_executable(
${MBGL_ROOT}/platform/qt/test/main.cpp
)
target_include_directories(
mbgl-test-runner
PUBLIC ${MBGL_ROOT}/include ${MBGL_ROOT}/test/include
)
target_compile_definitions(
mbgl-test-runner
PRIVATE WORK_DIRECTORY=${MBGL_ROOT}
@@ -176,10 +181,21 @@ target_link_libraries(
Qt5::Gui
Qt5::OpenGL
mbgl-compiler-options
mbgl-test
pthread
)
if(CMAKE_SYSTEM_NAME STREQUAL Darwin)
target_link_libraries(
mbgl-test-runner
PRIVATE -Wl,-force_load mbgl-test
)
else()
target_link_libraries(
mbgl-test-runner
PRIVATE -Wl,--whole-archive mbgl-test -Wl,--no-whole-archive
)
endif()
find_program(MBGL_QDOC NAMES qdoc)
if(MBGL_QDOC)