Mercurial > malikania
diff libcommon/CMakeLists.txt @ 30:a1e80d991968
Misc: convert to spaces, #519
author | David Demelier <markand@malikania.fr> |
---|---|
date | Thu, 16 Jun 2016 13:35:31 +0200 |
parents | 787c2adb366c |
children | d4f5f7231b84 |
line wrap: on
line diff
--- a/libcommon/CMakeLists.txt Thu May 26 07:32:05 2016 +0200 +++ b/libcommon/CMakeLists.txt Thu Jun 16 13:35:31 2016 +0200 @@ -17,54 +17,54 @@ # set( - HEADERS - ${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/js.h - ${CMAKE_CURRENT_SOURCE_DIR}/malikania/js-elapsed-timer.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 + HEADERS + ${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/js.h + ${CMAKE_CURRENT_SOURCE_DIR}/malikania/js-elapsed-timer.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/elapsed-timer.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/malikania/js-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 + SOURCES + ${CMAKE_CURRENT_SOURCE_DIR}/malikania/application.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/malikania/elapsed-timer.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/malikania/js-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) + find_package(SDL2 REQUIRED) - 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}) + 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 () if (WIN32) - list(APPEND LIBRARIES ws2_32) + list(APPEND LIBRARIES ws2_32) endif () malikania_create_library( - PROJECT libcommon - TARGET libcommon - SOURCES ${HEADERS} ${SOURCES} - FLAGS "MALIKANIA_COMMON_BUILD" - PUBLIC_INCLUDES - ${CMAKE_CURRENT_SOURCE_DIR} - ${INCLUDES} - $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/malikania> - LIBRARIES extern-jansson ${LIBRARIES} + PROJECT libcommon + TARGET libcommon + SOURCES ${HEADERS} ${SOURCES} + FLAGS "MALIKANIA_COMMON_BUILD" + PUBLIC_INCLUDES + ${CMAKE_CURRENT_SOURCE_DIR} + ${INCLUDES} + $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/malikania> + LIBRARIES extern-jansson ${LIBRARIES} ) set_target_properties(libcommon PROPERTIES PREFIX "")