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

Merge pull request #97 from OdyX/dev-minor-cmake-grammar-fix 

Minor cmake grammar fix
dev-ui
krzys-h 2012-12-18 03:45:06 -08:00
parent 1c473c3a82 a7d837460f
commit a044ec16a9
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -160,8 +160,8 @@ if(${TESTS})
endif() endif()
# TODO: provide data files as git submodule # TODO: provide data files as git submodule
set(COLOBOT_DATA_DIR ${CMAKE_INSTALL_PREFIX}/share/games/colobot CACHE PATH "Colobot shared data directory") set(COLOBOT_DATA_DIR share/games/colobot CACHE PATH "Colobot shared data directory")
set(COLOBOT_LIB_DIR ${CMAKE_INSTALL_PREFIX}/lib/colobot CACHE PATH "Colobot libraries directory") set(COLOBOT_LIB_DIR lib/colobot CACHE PATH "Colobot libraries directory")
# Subdirectory with sources # Subdirectory with sources
add_subdirectory(src bin) add_subdirectory(src bin)

2
src/CBot/CMakeLists.txt
View File

@ -18,4 +18,4 @@ else()
add_library(CBot SHARED ${SOURCES}) add_library(CBot SHARED ${SOURCES})
endif() endif()
install(TARGETS CBot LIBRARY DESTINATION "${COLOBOT_LIB_DIR}") install(TARGETS CBot LIBRARY DESTINATION ${COLOBOT_LIB_DIR})