forked from teamnwah/openmw-tes3coop
add cmake fix for compiling with binutils >= 2.23 which requires explicit linking for dl<friends> and Xt
This commit is contained in:
parent
5bbab1abd9
commit
c1ec16986b
2 changed files with 12 additions and 0 deletions
|
@ -102,3 +102,9 @@ if (BUILD_WITH_CODE_COVERAGE)
|
||||||
add_definitions (--coverage)
|
add_definitions (--coverage)
|
||||||
target_link_libraries(omwlauncher gcov)
|
target_link_libraries(omwlauncher gcov)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
# Workaround for binutil => 2.23 problem when linking, should be fixed eventually upstream
|
||||||
|
if (UNIX AND NOT APPLE)
|
||||||
|
target_link_libraries(omwlauncher dl Xt)
|
||||||
|
endif()
|
||||||
|
|
||||||
|
|
|
@ -122,6 +122,12 @@ if (UNIX AND NOT APPLE)
|
||||||
target_link_libraries(openmw ${CMAKE_THREAD_LIBS_INIT})
|
target_link_libraries(openmw ${CMAKE_THREAD_LIBS_INIT})
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
# Workaround for binutil => 2.23 problem when linking, should be fixed eventually upstream
|
||||||
|
if (UNIX AND NOT APPLE)
|
||||||
|
target_link_libraries(openmw dl Xt)
|
||||||
|
endif()
|
||||||
|
|
||||||
|
|
||||||
if(APPLE)
|
if(APPLE)
|
||||||
find_library(CARBON_FRAMEWORK Carbon)
|
find_library(CARBON_FRAMEWORK Carbon)
|
||||||
find_library(COCOA_FRAMEWORK Cocoa)
|
find_library(COCOA_FRAMEWORK Cocoa)
|
||||||
|
|
Loading…
Reference in a new issue