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

Modernize CMake (4): localename

modernize-cmake-1
immibis 2020-07-04 17:30:52 +02:00
parent 1f2f857221
commit d57ca161f5
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@ -360,7 +360,6 @@ endif()
## ##
# Localename # Localename
## ##
set(LOCALENAME_INCLUDE_DIR ${colobot_SOURCE_DIR}/lib/localename)
add_subdirectory(lib/localename) add_subdirectory(lib/localename)

3
lib/localename/CMakeLists.txt
View File

@ -1,3 +1,4 @@
cmake_minimum_required(VERSION 2.8) cmake_minimum_required(VERSION 2.8)
add_library(localename STATIC localename.c) add_library(localename STATIC localename.c)
target_include_directories(localename PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>)

3
src/CMakeLists.txt
View File

@ -593,7 +593,6 @@ set(MAIN_SOURCES
# Libraries # Libraries
set(LIBS set(LIBS
CBot CBot
localename
${OPENGL_LIBRARY} ${OPENGL_LIBRARY}
${OPTIONAL_LIBS} ${OPTIONAL_LIBS}
${PLATFORM_LIBS} ${PLATFORM_LIBS}
@ -610,7 +609,6 @@ set(LOCAL_INCLUDES
) )
set(SYSTEM_INCLUDES set(SYSTEM_INCLUDES
${LOCALENAME_INCLUDE_DIR}
${LIBINTL_INCLUDE_PATH} ${LIBINTL_INCLUDE_PATH}
${OPTIONAL_INCLUDES} ${OPTIONAL_INCLUDES}
) )
@ -639,6 +637,7 @@ target_link_libraries(colobotbase PUBLIC
GLEW::GLEW GLEW::GLEW
PhysFS::PhysFS PhysFS::PhysFS
libsndfile::libsndfile libsndfile::libsndfile
localename
) )
add_executable(colobot ${MAIN_SOURCES}) add_executable(colobot ${MAIN_SOURCES})