Mercurial > malikania
diff libcommon/CMakeLists.txt @ 7:45b3c770803c
Misc: switch to lower case (part 2)
author | David Demelier <markand@malikania.fr> |
---|---|
date | Wed, 23 Mar 2016 17:11:39 +0100 |
parents | 67edc8b3e5e9 |
children | fe95a8db2970 |
line wrap: on
line diff
--- a/libcommon/CMakeLists.txt Wed Mar 23 09:49:51 2016 +0100 +++ b/libcommon/CMakeLists.txt Wed Mar 23 17:11:39 2016 +0100 @@ -18,34 +18,32 @@ set( HEADERS - ${CMAKE_CURRENT_SOURCE_DIR}/malikania/Application.h - ${CMAKE_CURRENT_SOURCE_DIR}/malikania/Game.h - ${CMAKE_CURRENT_SOURCE_DIR}/malikania/ElapsedTimer.h - ${CMAKE_CURRENT_SOURCE_DIR}/malikania/Game.h - ${CMAKE_CURRENT_SOURCE_DIR}/malikania/Id.h - ${CMAKE_CURRENT_SOURCE_DIR}/malikania/Js.h - ${CMAKE_CURRENT_SOURCE_DIR}/malikania/Json.h - ${CMAKE_CURRENT_SOURCE_DIR}/malikania/ResourcesLoader.h - ${CMAKE_CURRENT_SOURCE_DIR}/malikania/ResourcesLocator.h - ${CMAKE_CURRENT_SOURCE_DIR}/malikania/Util.h + ${CMAKE_CURRENT_SOURCE_DIR}/malikania/application.h + ${CMAKE_CURRENT_SOURCE_DIR}/malikania/game.h + ${CMAKE_CURRENT_SOURCE_DIR}/malikania/elapsed-timer.h + ${CMAKE_CURRENT_SOURCE_DIR}/malikania/game.h + ${CMAKE_CURRENT_SOURCE_DIR}/malikania/id.h + ${CMAKE_CURRENT_SOURCE_DIR}/malikania/json.h + ${CMAKE_CURRENT_SOURCE_DIR}/malikania/resources-loader.h + ${CMAKE_CURRENT_SOURCE_DIR}/malikania/resources-locator.h + ${CMAKE_CURRENT_SOURCE_DIR}/malikania/util.h ) set( SOURCES - ${CMAKE_CURRENT_SOURCE_DIR}/malikania/Application.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/malikania/ElapsedTimer.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/malikania/Js.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/malikania/Json.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/malikania/ResourcesLoader.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/malikania/ResourcesLocator.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/malikania/Util.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/malikania/application.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/malikania/elapsed-timer.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/malikania/json.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/malikania/resources-loader.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/malikania/resources-locator.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/malikania/util.cpp ) if (WITH_BACKEND_SDL) find_package(SDL2 REQUIRED) - list(APPEND HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/malikania/backend/sdl/CommonSdl.h) - list(APPEND SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/malikania/backend/sdl/CommonSdl.cpp) + list(APPEND HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/malikania/backend/sdl/common-sdl.h) + list(APPEND SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/malikania/backend/sdl/common-sdl.cpp) list(APPEND INCLUDES ${SDL2_INCLUDE_DIRS}) list(APPEND LIBRARIES ${SDL2_LIBRARIES}) endif () @@ -59,18 +57,8 @@ TARGET libcommon SOURCES ${HEADERS} ${SOURCES} FLAGS "MALIKANIA_COMMON_BUILD" - PUBLIC_INCLUDES - ${CMAKE_CURRENT_SOURCE_DIR} - ${Jansson_INCLUDE_DIRS} - ${ZIP_INCLUDE_DIRS} - ${OPENSSL_INCLUDE_DIR} - ${INCLUDES} - LIBRARIES - extern-jansson - ${LIBRARIES} - ${Jansson_LIBRARIES} - ${ZIP_LIBRARIES} - ${OPENSSL_LIBRARIES} + PUBLIC_INCLUDES ${CMAKE_CURRENT_SOURCE_DIR} ${INCLUDES} + LIBRARIES extern-jansson ${LIBRARIES} ) set_target_properties(libcommon PROPERTIES PREFIX "")