sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

should use the ADDITIONAL_LIBARIES_PATHS var...

Browse source
This commit is contained in:
Mathis Logemann 2021-01-27 01:20:32 +01:00
parent e60d4368ed
commit 4bc99d8047
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
demo/viewer/CMakeLists.txt
View file

@ -46,7 +46,7 @@ install(TARGETS mapnik-viewer
) )
if(WIN32) if(ADDITIONAL_LIBARIES_PATHS AND WIN32)
include(CopyDllsForDebug) include(CopyDllsForDebug)
add_custom_command(TARGET mapnik-viewer POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy "$<TARGET_FILE:mapnik::mapnik>" ${CMAKE_CURRENT_BINARY_DIR}) add_custom_command(TARGET mapnik-viewer POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy "$<TARGET_FILE:mapnik::mapnik>" ${CMAKE_CURRENT_BINARY_DIR})
copy_dlls_for_debug(mapnik-viewer \"\" \"${ADDITIONAL_LIBARIES_PATHS}\") copy_dlls_for_debug(mapnik-viewer \"\" \"${ADDITIONAL_LIBARIES_PATHS}\")

2
test/CMakeLists.txt
View file

@ -168,7 +168,7 @@ include(CTest)
include(${catch2_SOURCE_DIR}/contrib/Catch.cmake) include(${catch2_SOURCE_DIR}/contrib/Catch.cmake)
include(${catch2_SOURCE_DIR}/contrib/ParseAndAddCatchTests.cmake) include(${catch2_SOURCE_DIR}/contrib/ParseAndAddCatchTests.cmake)
if(WIN32) if(ADDITIONAL_LIBARIES_PATHS AND WIN32)
include(CopyDllsForDebug) include(CopyDllsForDebug)
add_custom_command(TARGET mapnik-test-unit POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy "$<TARGET_FILE:mapnik::mapnik>" ${CMAKE_CURRENT_BINARY_DIR}) add_custom_command(TARGET mapnik-test-unit POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy "$<TARGET_FILE:mapnik::mapnik>" ${CMAKE_CURRENT_BINARY_DIR})
set(APPS mapnik-test-unit agg_rasterizer_integer_overflow_test datasource_registration_test font_registration_test map_xml_test mapnik-test-visual) set(APPS mapnik-test-unit agg_rasterizer_integer_overflow_test datasource_registration_test font_registration_test map_xml_test mapnik-test-visual)