Merge pull request #5455 from evharten/master
Buildsystem/CMake: Link MPQ-library earlier in the chain to fix a compileissue for -DTOOLS on Ubuntu systems.
This commit is contained in:
@@ -33,9 +33,9 @@ add_executable(mapextractor
|
|||||||
)
|
)
|
||||||
|
|
||||||
target_link_libraries(mapextractor
|
target_link_libraries(mapextractor
|
||||||
|
mpq
|
||||||
${BZIP2_LIBRARIES}
|
${BZIP2_LIBRARIES}
|
||||||
${ZLIB_LIBRARIES}
|
${ZLIB_LIBRARIES}
|
||||||
mpq
|
|
||||||
)
|
)
|
||||||
|
|
||||||
add_dependencies(mapextractor mpq)
|
add_dependencies(mapextractor mpq)
|
||||||
|
|||||||
@@ -34,9 +34,9 @@ endif()
|
|||||||
add_executable(vmap4extractor ${sources})
|
add_executable(vmap4extractor ${sources})
|
||||||
|
|
||||||
target_link_libraries(vmap4extractor
|
target_link_libraries(vmap4extractor
|
||||||
|
mpq
|
||||||
${BZIP2_LIBRARIES}
|
${BZIP2_LIBRARIES}
|
||||||
${ZLIB_LIBRARIES}
|
${ZLIB_LIBRARIES}
|
||||||
mpq
|
|
||||||
)
|
)
|
||||||
|
|
||||||
add_dependencies(vmap4extractor mpq)
|
add_dependencies(vmap4extractor mpq)
|
||||||
|
|||||||
Reference in New Issue
Block a user