Skip to content

Commit e06ea04

Browse files
twostarstwostars
committed
Ensure all paths are quoted for safety
1 parent 1e404a9 commit e06ea04

File tree

16 files changed

+115
-128
lines changed

16 files changed

+115
-128
lines changed

‎CMakeLists.txt‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,8 @@ if(is_multi_config)
4747
else()
4848
# Default build type to Debug
4949
if(NOT CMAKE_BUILD_TYPE)
50-
message(STATUS "Setting build type to 'Debug' as none was specified via -DCMAKE_BUILD_TYPE (expected build types: Debug, Release, RelWithDebugInfo, MinSizeRel)")
50+
message(STATUS "OpenKO: Defaulting build type to 'Debug' as none was specified via -DCMAKE_BUILD_TYPE (expected build types: Debug, Release, RelWithDebugInfo, MinSizeRel)")
51+
5152
set(CMAKE_BUILD_TYPE "Debug" CACHE STRING "Build type" FORCE)
5253
set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS "Debug" "Release" "RelWithDebInfo" "MinSizeRel")
5354
endif()
@@ -72,8 +73,7 @@ add_subdirectory(shared)
7273
set_target_properties(shared PROPERTIES FOLDER "")
7374

7475
include_directories(
75-
${CMAKE_SOURCE_DIR} # repo root, for <shared/...>
76-
${OPENKO_DEPS_DIR} # dependencies like asio, spdlog, etc.
76+
"${CMAKE_SOURCE_DIR}" # repo root, for <shared/...>
7777
)
7878

7979
if(OPENKO_BUILD_SERVERS)
@@ -96,11 +96,11 @@ if(OPENKO_BUILD_SERVERS)
9696

9797
add_custom_target(copy-server-assets ALL
9898
COMMENT "Copying server assets"
99-
COMMAND ${CMAKE_COMMAND} -E echo "Copying server MAP dir to ${OPENKO_SERVER_MAP_DST_DIR}"
100-
COMMAND ${CMAKE_COMMAND} -E copy_directory "${OPENKO_SERVER_MAP_SRC_DIR}" "${OPENKO_SERVER_MAP_DST_DIR}"
101-
COMMAND ${CMAKE_COMMAND} -E echo "Copying server QUESTS dir to ${OPENKO_SERVER_QUESTS_DST_DIR}"
102-
COMMAND ${CMAKE_COMMAND} -E copy_directory "${OPENKO_SERVER_QUESTS_SRC_DIR}" "${OPENKO_SERVER_QUESTS_DST_DIR}"
103-
COMMAND ${CMAKE_COMMAND} -E echo "Server assets copied."
99+
COMMAND "${CMAKE_COMMAND}" -E echo "Copying server MAP dir to ${OPENKO_SERVER_MAP_DST_DIR}"
100+
COMMAND "${CMAKE_COMMAND}" -E copy_directory "${OPENKO_SERVER_MAP_SRC_DIR}" "${OPENKO_SERVER_MAP_DST_DIR}"
101+
COMMAND "${CMAKE_COMMAND}" -E echo "Copying server QUESTS dir to ${OPENKO_SERVER_QUESTS_DST_DIR}"
102+
COMMAND "${CMAKE_COMMAND}" -E copy_directory "${OPENKO_SERVER_QUESTS_SRC_DIR}" "${OPENKO_SERVER_QUESTS_DST_DIR}"
103+
COMMAND "${CMAKE_COMMAND}" -E echo "Server assets copied."
104104
)
105105

106106
# Servers

‎Server/AIServer/CMakeLists.txt‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,9 @@ endif()
5656
target_precompile_headers(AIServer PRIVATE pch.h)
5757

5858
# Setup dependencies
59-
target_link_libraries(AIServer
60-
PRIVATE
61-
shared-server
62-
db-library
59+
target_link_libraries(AIServer PRIVATE
60+
shared-server
61+
db-library
6362
)
6463

6564
# Setup warning levels
@@ -76,5 +75,5 @@ if(MSVC)
7675
endif()
7776

7877
add_custom_command(TARGET AIServer POST_BUILD
79-
COMMAND ${CMAKE_COMMAND} -E echo "$<TARGET_FILE:AIServer> has been built"
78+
COMMAND "${CMAKE_COMMAND}" -E echo "$<TARGET_FILE:AIServer> has been built"
8079
)

‎Server/Aujard/CMakeLists.txt‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,9 @@ endif()
2424
target_precompile_headers(Aujard PRIVATE pch.h)
2525

2626
# Setup dependencies
27-
target_link_libraries(Aujard
28-
PRIVATE
29-
shared-server
30-
db-library
27+
target_link_libraries(Aujard PRIVATE
28+
shared-server
29+
db-library
3130
)
3231

3332
# Setup warning levels
@@ -45,5 +44,5 @@ if(MSVC)
4544
endif()
4645

4746
add_custom_command(TARGET Aujard POST_BUILD
48-
COMMAND ${CMAKE_COMMAND} -E echo "$<TARGET_FILE:Aujard> has been built"
47+
COMMAND "${CMAKE_COMMAND}" -E echo "$<TARGET_FILE:Aujard> has been built"
4948
)

‎Server/Ebenezer/CMakeLists.txt‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -68,10 +68,9 @@ endif()
6868
target_precompile_headers(Ebenezer PRIVATE pch.h)
6969

7070
# Setup dependencies
71-
target_link_libraries(Ebenezer
72-
PRIVATE
73-
shared-server
74-
db-library
71+
target_link_libraries(Ebenezer PRIVATE
72+
shared-server
73+
db-library
7574
)
7675

7776
# Setup warning levels
@@ -89,5 +88,5 @@ if(MSVC)
8988
endif()
9089

9190
add_custom_command(TARGET Ebenezer POST_BUILD
92-
COMMAND ${CMAKE_COMMAND} -E echo "$<TARGET_FILE:Ebenezer> has been built"
91+
COMMAND "${CMAKE_COMMAND}" -E echo "$<TARGET_FILE:Ebenezer> has been built"
9392
)

‎Server/ItemManager/CMakeLists.txt‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,8 @@ endif()
2424
target_precompile_headers(ItemManager PRIVATE pch.h)
2525

2626
# Setup dependencies
27-
target_link_libraries(ItemManager
28-
PRIVATE
29-
shared-server
27+
target_link_libraries(ItemManager PRIVATE
28+
shared-server
3029
)
3130

3231
# Setup warning levels
@@ -44,5 +43,5 @@ if(MSVC)
4443
endif()
4544

4645
add_custom_command(TARGET ItemManager POST_BUILD
47-
COMMAND ${CMAKE_COMMAND} -E echo "$<TARGET_FILE:ItemManager> has been built"
46+
COMMAND "${CMAKE_COMMAND}" -E echo "$<TARGET_FILE:ItemManager> has been built"
4847
)

‎Server/VersionManager/CMakeLists.txt‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,9 @@ endif()
2424
target_precompile_headers(VersionManager PRIVATE pch.h)
2525

2626
# Setup dependencies
27-
target_link_libraries(VersionManager
28-
PRIVATE
29-
shared-server
30-
db-library
27+
target_link_libraries(VersionManager PRIVATE
28+
shared-server
29+
db-library
3130
)
3231

3332
# Setup warning levels
@@ -45,5 +44,5 @@ if(MSVC)
4544
endif()
4645

4746
add_custom_command(TARGET VersionManager POST_BUILD
48-
COMMAND ${CMAKE_COMMAND} -E echo "$<TARGET_FILE:VersionManager> has been built"
47+
COMMAND "${CMAKE_COMMAND}" -E echo "$<TARGET_FILE:VersionManager> has been built"
4948
)

‎Server/shared-server/CMakeLists.txt‎

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
# We use a user-modifiable config file for the server files named server_config.h
22
# This is copied from the default if it doesn't already exist.
3-
set(DEFAULT_CONFIG_HEADER ${CMAKE_CURRENT_SOURCE_DIR}/server_config.h.default)
4-
set(TARGET_CONFIG_DIR ${CMAKE_CURRENT_BINARY_DIR}/shared-server)
5-
set(TARGET_CONFIG_HEADER ${TARGET_CONFIG_DIR}/server_config.h)
3+
set(DEFAULT_CONFIG_HEADER "${CMAKE_CURRENT_SOURCE_DIR}/server_config.h.default")
4+
set(TARGET_CONFIG_DIR "${CMAKE_CURRENT_BINARY_DIR}/shared-server")
5+
set(TARGET_CONFIG_HEADER "${TARGET_CONFIG_DIR}/server_config.h")
66

77
# Make sure the target directory exists
8-
file(MAKE_DIRECTORY ${TARGET_CONFIG_DIR})
8+
file(MAKE_DIRECTORY "${TARGET_CONFIG_DIR}")
99

10-
if(NOT EXISTS ${TARGET_CONFIG_HEADER})
11-
configure_file(${DEFAULT_CONFIG_HEADER} ${TARGET_CONFIG_HEADER} COPYONLY)
10+
if(NOT EXISTS "${TARGET_CONFIG_HEADER}")
11+
configure_file("${DEFAULT_CONFIG_HEADER}" "${TARGET_CONFIG_HEADER}" COPYONLY)
1212
endif()
1313

1414
add_library(shared-server STATIC
@@ -41,7 +41,7 @@ add_library(shared-server STATIC
4141
TcpSocket.h
4242
utilities.cpp
4343
utilities.h
44-
${TARGET_CONFIG_HEADER}
44+
"${TARGET_CONFIG_HEADER}"
4545
)
4646

4747
# Enable warnings as errors
@@ -67,10 +67,9 @@ target_link_libraries(shared-server
6767
)
6868

6969
# Expose include path
70-
target_include_directories(shared-server
71-
PUBLIC
72-
${CMAKE_CURRENT_SOURCE_DIR}/../
73-
${CMAKE_CURRENT_BINARY_DIR}/
70+
target_include_directories(shared-server PUBLIC
71+
"${CMAKE_CURRENT_SOURCE_DIR}/../" # so we can access <shared-server/...>
72+
"${CMAKE_CURRENT_BINARY_DIR}/" # we copied server_config.h here, under "shared-server", so we should be able to access it too
7473
)
7574

7675
# Setup warning levels

‎deps/FTXUI-cmake/CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
fetchcontent_declare(
22
ftxui
3-
GIT_REPOSITORY https://github.com/ArthurSonzogni/FTXUI.git
4-
GIT_TAG v6.1.9
3+
GIT_REPOSITORY "https://github.com/ArthurSonzogni/FTXUI.git"
4+
GIT_TAG "v6.1.9"
55
GIT_PROGRESS ON
66
GIT_SHALLOW ON
77
OVERRIDE_FIND_PACKAGE TRUE

‎deps/asio-cmake/CMakeLists.txt‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
fetchcontent_declare(
22
asio
3-
GIT_REPOSITORY https://github.com/chriskohlhoff/asio.git
4-
GIT_TAG asio-1-36-0
3+
GIT_REPOSITORY "https://github.com/chriskohlhoff/asio.git"
4+
GIT_TAG "asio-1-36-0"
55
GIT_PROGRESS ON
66
GIT_SHALLOW ON
77
OVERRIDE_FIND_PACKAGE TRUE
@@ -15,13 +15,13 @@ fetchcontent_makeavailable(asio)
1515
message(STATUS "OpenKO: [asio] Up-to-date!")
1616

1717
add_library(asio STATIC
18-
${asio_SOURCE_DIR}/asio/src/asio.cpp
19-
${asio_SOURCE_DIR}/asio/include/asio.hpp
18+
"${asio_SOURCE_DIR}/asio/src/asio.cpp"
19+
"${asio_SOURCE_DIR}/asio/include/asio.hpp"
2020
)
2121

2222
target_include_directories(asio
23-
PUBLIC ${asio_SOURCE_DIR}/asio/include
24-
PRIVATE ${asio_SOURCE_DIR}
23+
PUBLIC "${asio_SOURCE_DIR}/asio/include"
24+
PRIVATE "${asio_SOURCE_DIR}"
2525
)
2626

2727
# Build as standalone

‎deps/boost-cmake/CMakeLists.txt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ set(BOOST_SUBMODULES # This isn't exactly ideal, but since we only use a tiny su
88

99
fetchcontent_declare(
1010
Boost
11-
GIT_REPOSITORY https://github.com/boostorg/boost.git
12-
GIT_TAG boost-1.89.0
13-
GIT_SUBMODULES ${BOOST_SUBMODULES}
11+
GIT_REPOSITORY "https://github.com/boostorg/boost.git"
12+
GIT_TAG "boost-1.89.0"
13+
GIT_SUBMODULES "${BOOST_SUBMODULES}"
1414
GIT_PROGRESS TRUE
1515
GIT_SHALLOW TRUE
1616
OVERRIDE_FIND_PACKAGE TRUE

0 commit comments

Comments
 (0)