64 lines
1.7 KiB
Plaintext
64 lines
1.7 KiB
Plaintext
$OpenBSD: patch-src_CMakeLists_txt,v 1.5 2018/12/25 15:18:20 bcallah Exp $
|
|
|
|
Install to the correct location.
|
|
Don't do the cpplint stuff.
|
|
|
|
Index: src/CMakeLists.txt
|
|
--- src/CMakeLists.txt.orig
|
|
+++ src/CMakeLists.txt
|
|
@@ -42,7 +42,6 @@ set(TOOLS_HEADERS debug.h
|
|
buffer.h)
|
|
|
|
add_library(tools STATIC ${TOOLS_SOURCES} ${TOOLS_HEADERS})
|
|
-target_check_style(tools)
|
|
|
|
# Game library
|
|
|
|
@@ -76,7 +75,6 @@ set(GAME_HEADERS building.h
|
|
game-manager.h)
|
|
|
|
add_library(game STATIC ${GAME_SOURCES} ${GAME_HEADERS})
|
|
-target_check_style(game)
|
|
|
|
# Platform library
|
|
|
|
@@ -104,7 +102,6 @@ else()
|
|
endif()
|
|
|
|
add_library(platform STATIC ${PLATFORM_SOURCES} ${PLATFORM_HEADERS})
|
|
-target_check_style(platform)
|
|
|
|
# Data library
|
|
|
|
@@ -148,7 +145,6 @@ else()
|
|
endif()
|
|
|
|
add_library(data STATIC ${DATA_SOURCES} ${DATA_HEADERS})
|
|
-target_check_style(data)
|
|
|
|
# FreeSerf executable
|
|
|
|
@@ -188,7 +184,6 @@ set(OTHER_HEADERS pathfinder.h
|
|
set(FREESERF_SOURCES freeserf.cc ${OTHER_SOURCES})
|
|
set(FREESERF_HEADERS freeserf.h ${OTHER_HEADERS})
|
|
add_executable(FreeSerf MACOSX_BUNDLE WIN32 ${FREESERF_SOURCES} ${FREESERF_HEADERS})
|
|
-target_check_style(FreeSerf)
|
|
|
|
target_link_libraries(FreeSerf game platform data tools)
|
|
if(SDL2_FOUND)
|
|
@@ -206,7 +201,7 @@ endif()
|
|
if(XMP_FOUND)
|
|
target_link_libraries(FreeSerf optimized ${XMP_LIBRARY} debug ${XMP_LIBRARY_DEBUG})
|
|
endif()
|
|
-install(TARGETS FreeSerf DESTINATION ".")
|
|
+install(TARGETS FreeSerf DESTINATION "bin")
|
|
|
|
if(WIN32)
|
|
if(DEFINED _VCPKG_INSTALLED_DIR)
|
|
@@ -274,5 +269,4 @@ set(PROFILER_HEADERS profiler.h
|
|
command_line.h)
|
|
|
|
add_executable(profiler ${PROFILER_SOURCES} ${PROFILER_HEADERS})
|
|
-target_check_style(profiler)
|
|
target_link_libraries(profiler game tools)
|