immibis
/
colobot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Changed order of libs in cmake for clipboard

dev-ui
erihel 2013-04-20 19:41:39 +02:00
parent dd180dd887
commit 32fdf993ea
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/CMakeLists.txt
View File

@ -186,6 +186,7 @@ ${OPENAL_SRC}
set(LIBS set(LIBS
CBot CBot
clipboard
${SDL_LIBRARY} ${SDL_LIBRARY}
${SDLIMAGE_LIBRARY} ${SDLIMAGE_LIBRARY}
${SDLTTF_LIBRARY} ${SDLTTF_LIBRARY}
@ -196,7 +197,6 @@ ${Boost_LIBRARIES}
${LIBSNDFILE_LIBRARY} ${LIBSNDFILE_LIBRARY}
${OPTIONAL_LIBS} ${OPTIONAL_LIBS}
${PLATFORM_LIBS} ${PLATFORM_LIBS}
clipboard
) )
# Local # Local

2
test/unit/CMakeLists.txt
View File

@ -211,6 +211,7 @@ set(LIBS
gtest gtest
gmock gmock
CBot CBot
clipboard
${SDL_LIBRARY} ${SDL_LIBRARY}
${SDLIMAGE_LIBRARY} ${SDLIMAGE_LIBRARY}
${SDLTTF_LIBRARY} ${SDLTTF_LIBRARY}
@ -221,7 +222,6 @@ ${Boost_LIBRARIES}
${OPTIONAL_LIBS} ${OPTIONAL_LIBS}
${PLATFORM_LIBS} ${PLATFORM_LIBS}
${LIBSNDFILE_LIBRARY} ${LIBSNDFILE_LIBRARY}
clipboard
) )
add_executable(colobot_ut ${COLOBOT_SOURCES} ${UT_SOURCES} ${OPENAL_SOURCES}) add_executable(colobot_ut ${COLOBOT_SOURCES} ${UT_SOURCES} ${OPENAL_SOURCES})

6
test/unit/ui/CMakeLists.txt
View File

@ -13,10 +13,10 @@ if (${PLATFORM_WINDOWS})
set(SYSTEM_CPP_MODULE "system_windows.cpp") set(SYSTEM_CPP_MODULE "system_windows.cpp")
elseif(${PLATFORM_LINUX}) elseif(${PLATFORM_LINUX})
set(SYSTEM_CPP_MODULE "system_linux.cpp") set(SYSTEM_CPP_MODULE "system_linux.cpp")
set(ADDITIONAL_LIB X11) set(ADDITIONAL_LIB "-lX11")
else() else()
set(SYSTEM_CPP_MODULE "system_other.cpp") set(SYSTEM_CPP_MODULE "system_other.cpp")
set(ADDITIONAL_LIB X11) set(ADDITIONAL_LIB "-lX11")
endif() endif()
add_executable(edit_test add_executable(edit_test
@ -40,7 +40,7 @@ stubs/restext_stub.cpp
stubs/robotmain_stub.cpp stubs/robotmain_stub.cpp
edit_test.cpp) edit_test.cpp)
target_link_libraries(edit_test gtest gmock ${SDL_LIBRARY} ${SDLTTF_LIBRARY} ${Boost_LIBRARIES} ${ADDITIONAL_LIB} clipboard) target_link_libraries(edit_test gtest gmock clipboard ${SDL_LIBRARY} ${SDLTTF_LIBRARY} ${Boost_LIBRARIES} ${ADDITIONAL_LIB})