diff options
| author | click <clickvd@gonnamakeyou.com> | 2012-03-04 07:28:07 -0800 |
|---|---|---|
| committer | click <clickvd@gonnamakeyou.com> | 2012-03-04 07:28:07 -0800 |
| commit | 517f64b518e44efd1d085418e262fee2d4348e7c (patch) | |
| tree | b50fe99b32be081edc458bb5ee447b72f9921cd5 /src | |
| parent | 576c659a9c15dc342fdf7aa97fb9c308d1996aae (diff) | |
| parent | 9610b9e53c5f7e0112f67e0c8b4bccc62c663efa (diff) | |
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.
Diffstat (limited to 'src')
| -rw-r--r-- | src/tools/map_extractor/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/tools/vmap4_extractor/CMakeLists.txt | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/tools/map_extractor/CMakeLists.txt b/src/tools/map_extractor/CMakeLists.txt index afeb8af99ba..bde62c24c70 100644 --- a/src/tools/map_extractor/CMakeLists.txt +++ b/src/tools/map_extractor/CMakeLists.txt @@ -33,9 +33,9 @@ add_executable(mapextractor ) target_link_libraries(mapextractor + mpq ${BZIP2_LIBRARIES} ${ZLIB_LIBRARIES} - mpq ) add_dependencies(mapextractor mpq) diff --git a/src/tools/vmap4_extractor/CMakeLists.txt b/src/tools/vmap4_extractor/CMakeLists.txt index 1c44b01bbec..5c98d84eb17 100644 --- a/src/tools/vmap4_extractor/CMakeLists.txt +++ b/src/tools/vmap4_extractor/CMakeLists.txt @@ -34,9 +34,9 @@ endif() add_executable(vmap4extractor ${sources}) target_link_libraries(vmap4extractor + mpq ${BZIP2_LIBRARIES} ${ZLIB_LIBRARIES} - mpq ) add_dependencies(vmap4extractor mpq) |