Skip to content

Commit 26a7077

Browse files
zaozao
committed
Make CMake whitespace consistent
1 parent 5cbe2e7 commit 26a7077

File tree

2 files changed

+153
-153
lines changed

2 files changed

+153
-153
lines changed

‎CMakeLists.txt‎

Lines changed: 64 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ if (APPLE)
88
endif ()
99

1010
if (MSVC)
11-
add_compile_options("/Zi")
12-
add_link_options("/DEBUG:FULL")
11+
add_compile_options("/Zi")
12+
add_link_options("/DEBUG:FULL")
1313
endif ()
1414

1515
list(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake")
@@ -109,33 +109,33 @@ find_package(Threads REQUIRED)
109109
find_package(ZLIB REQUIRED)
110110

111111
add_library(imgui STATIC
112-
dep/imgui/imconfig.h
113-
dep/imgui/imgui.cpp
114-
dep/imgui/imgui.h
115-
dep/imgui/imgui_demo.cpp
116-
dep/imgui/imgui_draw.cpp
117-
dep/imgui/imgui_internal.h
118-
dep/imgui/imgui_tables.cpp
119-
dep/imgui/imgui_widgets.cpp
120-
dep/imgui/imstb_rectpack.h
121-
dep/imgui/imstb_textedit.h
122-
dep/imgui/imstb_truetype.h
123-
dep/imgui/backends/imgui_impl_glfw.cpp
124-
dep/imgui/backends/imgui_impl_glfw.h
125-
dep/imgui/backends/imgui_impl_opengl3.cpp
126-
dep/imgui/backends/imgui_impl_opengl3.h
127-
dep/imgui/backends/imgui_impl_opengl3_loader.h
128-
dep/imgui/misc/cpp/imgui_stdlib.cpp
129-
dep/imgui/misc/cpp/imgui_stdlib.h
112+
dep/imgui/imconfig.h
113+
dep/imgui/imgui.cpp
114+
dep/imgui/imgui.h
115+
dep/imgui/imgui_demo.cpp
116+
dep/imgui/imgui_draw.cpp
117+
dep/imgui/imgui_internal.h
118+
dep/imgui/imgui_tables.cpp
119+
dep/imgui/imgui_widgets.cpp
120+
dep/imgui/imstb_rectpack.h
121+
dep/imgui/imstb_textedit.h
122+
dep/imgui/imstb_truetype.h
123+
dep/imgui/backends/imgui_impl_glfw.cpp
124+
dep/imgui/backends/imgui_impl_glfw.h
125+
dep/imgui/backends/imgui_impl_opengl3.cpp
126+
dep/imgui/backends/imgui_impl_opengl3.h
127+
dep/imgui/backends/imgui_impl_opengl3_loader.h
128+
dep/imgui/misc/cpp/imgui_stdlib.cpp
129+
dep/imgui/misc/cpp/imgui_stdlib.h
130130
)
131131

132132
target_compile_definitions(imgui PUBLIC
133-
"IMGUI_IMPL_OPENGL_ES2"
133+
"IMGUI_IMPL_OPENGL_ES2"
134134
)
135135

136136
target_include_directories(imgui PUBLIC
137-
dep/imgui
138-
dep/imgui/backends
137+
dep/imgui
138+
dep/imgui/backends
139139
)
140140

141141
target_link_libraries(imgui PUBLIC
@@ -181,7 +181,7 @@ target_link_libraries(SimpleGraphic
181181
fmt::fmt
182182
glfw
183183
imgui
184-
LuaJIT::LuaJIT
184+
LuaJIT::LuaJIT
185185
re2::re2
186186
unofficial-sodium::sodium
187187
Threads::Threads
@@ -192,47 +192,47 @@ install(FILES $<TARGET_RUNTIME_DLLS:SimpleGraphic> DESTINATION ".")
192192
install(TARGETS SimpleGraphic RUNTIME DESTINATION ".")
193193

194194
if (WIN32)
195-
set(DEPS_DIR "${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}")
196-
function(Honk result_var item)
197-
message("Considering ${item}...")
198-
set(${result_var} FALSE PARENT_SCOPE)
199-
endfunction()
200-
201-
find_file(LuaJIT_DLL_DEBUG
202-
NAMES "lua51.dll"
203-
PATHS "${DEPS_DIR}"
204-
PATH_SUFFIXES "debug/bin"
205-
REQUIRED
206-
NO_DEFAULT_PATH
207-
)
195+
set(DEPS_DIR "${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}")
196+
function(Honk result_var item)
197+
message("Considering ${item}...")
198+
set(${result_var} FALSE PARENT_SCOPE)
199+
endfunction()
200+
201+
find_file(LuaJIT_DLL_DEBUG
202+
NAMES "lua51.dll"
203+
PATHS "${DEPS_DIR}"
204+
PATH_SUFFIXES "debug/bin"
205+
REQUIRED
206+
NO_DEFAULT_PATH
207+
)
208208
find_file(LuaJIT_DLL_RELEASE
209-
NAMES "lua51.dll"
210-
PATHS "${DEPS_DIR}"
211-
PATH_SUFFIXES "bin"
212-
REQUIRED
213-
NO_DEFAULT_PATH
214-
)
209+
NAMES "lua51.dll"
210+
PATHS "${DEPS_DIR}"
211+
PATH_SUFFIXES "bin"
212+
REQUIRED
213+
NO_DEFAULT_PATH
214+
)
215215
find_file(ZLIB_DLL_DEBUG
216-
NAMES "zlibd1.dll"
217-
PATHS "${DEPS_DIR}"
218-
PATH_SUFFIXES "debug/bin"
219-
REQUIRED
220-
NO_DEFAULT_PATH
221-
)
222-
find_file(ZLIB_DLL_RELEASE
223-
NAMES "zlib1.dll"
224-
PATHS "${DEPS_DIR}"
225-
PATH_SUFFIXES "bin"
226-
REQUIRED
227-
NO_DEFAULT_PATH
228-
)
229-
230-
install(FILES ${LuaJIT_DLL_DEBUG} ${ZLIB_DLL_DEBUG} DESTINATION "."
231-
CONFIGURATIONS Debug
232-
)
216+
NAMES "zlibd1.dll"
217+
PATHS "${DEPS_DIR}"
218+
PATH_SUFFIXES "debug/bin"
219+
REQUIRED
220+
NO_DEFAULT_PATH
221+
)
222+
find_file(ZLIB_DLL_RELEASE
223+
NAMES "zlib1.dll"
224+
PATHS "${DEPS_DIR}"
225+
PATH_SUFFIXES "bin"
226+
REQUIRED
227+
NO_DEFAULT_PATH
228+
)
229+
230+
install(FILES ${LuaJIT_DLL_DEBUG} ${ZLIB_DLL_DEBUG} DESTINATION "."
231+
CONFIGURATIONS Debug
232+
)
233233
install(FILES ${LuaJIT_DLL_RELEASE} ${ZLIB_DLL_RELEASE} DESTINATION "."
234-
CONFIGURATIONS Release MinSizeRel RelWithDebInfo
235-
)
234+
CONFIGURATIONS Release MinSizeRel RelWithDebInfo
235+
)
236236
endif ()
237237

238238

@@ -250,7 +250,7 @@ target_include_directories(lcurl
250250
target_link_libraries(lcurl
251251
PRIVATE
252252
CURL::libcurl
253-
LuaJIT::LuaJIT
253+
LuaJIT::LuaJIT
254254
)
255255

256256
install(TARGETS lcurl RUNTIME DESTINATION ".")
@@ -267,7 +267,7 @@ target_include_directories(lzip
267267

268268
target_link_libraries(lzip
269269
PRIVATE
270-
LuaJIT::LuaJIT
270+
LuaJIT::LuaJIT
271271
ZLIB::ZLIB
272272
)
273273

‎cmake/FindLuaJIT.cmake‎

Lines changed: 89 additions & 89 deletions
Original file line numberDiff line numberDiff line change
@@ -5,94 +5,94 @@
55
# LuaJIT_LIBRARIES - The libraries needed to use luajit
66

77
if (DEFINED VCPKG_INSTALLED_DIR AND DEFINED VCPKG_TARGET_TRIPLET)
8-
set(LuaJIT_SEARCH_ROOT ${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET})
9-
10-
find_path(LuaJIT_INCLUDE_DIR luajit.h
11-
PATHS ${LuaJIT_SEARCH_ROOT}/include
12-
PATH_SUFFIXES luajit
13-
NO_DEFAULT_PATH)
14-
15-
find_library(LuaJIT_LIBRARY_RELEASE NAMES lua51
16-
PATHS ${LuaJIT_SEARCH_ROOT}
17-
PATH_SUFFIXES lib
18-
NO_DEFAULT_PATH)
19-
20-
find_library(LuaJIT_LIBRARY_DEBUG NAMES lua51
21-
PATHS ${LuaJIT_SEARCH_ROOT}
22-
PATH_SUFFIXES debug/lib
23-
NO_DEFAULT_PATH)
24-
25-
include(SelectLibraryConfigurations)
26-
select_library_configurations(LuaJIT)
27-
28-
find_package_handle_standard_args(LuaJIT
29-
REQUIRED_VARS LuaJIT_LIBRARY LuaJIT_INCLUDE_DIR)
30-
mark_as_advanced(LuaJIT_INCLUDE_DIR LuaJIT_LIBRARY)
31-
32-
if(LuaJIT_FOUND)
33-
set(LuaJIT_INCLUDE_DIRS ${LuaJIT_INCLUDE_DIR})
34-
35-
if(NOT LuaJIT_LIBRARIES)
36-
set(LuaJIT_LIBRARIES ${LuaJIT_LIBRARY})
37-
endif()
38-
39-
if(NOT TARGET LuaJIT::LuaJIT)
40-
add_library(LuaJIT::LuaJIT UNKNOWN IMPORTED)
41-
set_target_properties(LuaJIT::LuaJIT PROPERTIES
42-
INTERFACE_INCLUDE_DIRECTORIES "${LuaJIT_INCLUDE_DIRS}")
43-
44-
if(LuaJIT_LIBRARY_RELEASE)
45-
set_property(TARGET LuaJIT::LuaJIT APPEND PROPERTY
46-
IMPORTED_CONFIGURATIONS RELEASE)
47-
set_target_properties(LuaJIT::LuaJIT PROPERTIES
48-
IMPORTED_LOCATION_RELEASE "${LuaJIT_LIBRARY_RELEASE}")
49-
endif()
50-
51-
if(LuaJIT_LIBRARY_DEBUG)
52-
set_property(TARGET LuaJIT::LuaJIT APPEND PROPERTY
53-
IMPORTED_CONFIGURATIONS DEBUG)
54-
set_target_properties(LuaJIT::LuaJIT PROPERTIES
55-
IMPORTED_LOCATION_DEBUG "${LuaJIT_LIBRARY_DEBUG}")
56-
endif()
57-
58-
if(NOT LuaJIT_LIBRARY_RELEASE AND NOT LuaJIT_LIBRARY_DEBUG)
59-
set_property(TARGET LuaJIT::LuaJIT APPEND PROPERTY
60-
IMPORTED_LOCATION "${LuaJIT_LIBRARY}")
61-
endif()
62-
endif()
63-
endif()
64-
unset(LuaJIT_SEARCH_ROOT)
8+
set(LuaJIT_SEARCH_ROOT ${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET})
9+
10+
find_path(LuaJIT_INCLUDE_DIR luajit.h
11+
PATHS ${LuaJIT_SEARCH_ROOT}/include
12+
PATH_SUFFIXES luajit
13+
NO_DEFAULT_PATH)
14+
15+
find_library(LuaJIT_LIBRARY_RELEASE NAMES lua51
16+
PATHS ${LuaJIT_SEARCH_ROOT}
17+
PATH_SUFFIXES lib
18+
NO_DEFAULT_PATH)
19+
20+
find_library(LuaJIT_LIBRARY_DEBUG NAMES lua51
21+
PATHS ${LuaJIT_SEARCH_ROOT}
22+
PATH_SUFFIXES debug/lib
23+
NO_DEFAULT_PATH)
24+
25+
include(SelectLibraryConfigurations)
26+
select_library_configurations(LuaJIT)
27+
28+
find_package_handle_standard_args(LuaJIT
29+
REQUIRED_VARS LuaJIT_LIBRARY LuaJIT_INCLUDE_DIR)
30+
mark_as_advanced(LuaJIT_INCLUDE_DIR LuaJIT_LIBRARY)
31+
32+
if(LuaJIT_FOUND)
33+
set(LuaJIT_INCLUDE_DIRS ${LuaJIT_INCLUDE_DIR})
34+
35+
if(NOT LuaJIT_LIBRARIES)
36+
set(LuaJIT_LIBRARIES ${LuaJIT_LIBRARY})
37+
endif()
38+
39+
if(NOT TARGET LuaJIT::LuaJIT)
40+
add_library(LuaJIT::LuaJIT UNKNOWN IMPORTED)
41+
set_target_properties(LuaJIT::LuaJIT PROPERTIES
42+
INTERFACE_INCLUDE_DIRECTORIES "${LuaJIT_INCLUDE_DIRS}")
43+
44+
if(LuaJIT_LIBRARY_RELEASE)
45+
set_property(TARGET LuaJIT::LuaJIT APPEND PROPERTY
46+
IMPORTED_CONFIGURATIONS RELEASE)
47+
set_target_properties(LuaJIT::LuaJIT PROPERTIES
48+
IMPORTED_LOCATION_RELEASE "${LuaJIT_LIBRARY_RELEASE}")
49+
endif()
50+
51+
if(LuaJIT_LIBRARY_DEBUG)
52+
set_property(TARGET LuaJIT::LuaJIT APPEND PROPERTY
53+
IMPORTED_CONFIGURATIONS DEBUG)
54+
set_target_properties(LuaJIT::LuaJIT PROPERTIES
55+
IMPORTED_LOCATION_DEBUG "${LuaJIT_LIBRARY_DEBUG}")
56+
endif()
57+
58+
if(NOT LuaJIT_LIBRARY_RELEASE AND NOT LuaJIT_LIBRARY_DEBUG)
59+
set_property(TARGET LuaJIT::LuaJIT APPEND PROPERTY
60+
IMPORTED_LOCATION "${LuaJIT_LIBRARY}")
61+
endif()
62+
endif()
63+
endif()
64+
unset(LuaJIT_SEARCH_ROOT)
6565
else ()
66-
find_package(PkgConfig)
67-
if (PKG_CONFIG_FOUND)
68-
pkg_check_modules(PC_LUAJIT QUIET luajit)
69-
endif()
70-
71-
set(LUAJIT_DEFINITIONS ${PC_LUAJIT_CFLAGS_OTHER})
72-
73-
find_path(LUAJIT_INCLUDE_DIR luajit.h
74-
PATHS ${PC_LUAJIT_INCLUDEDIR} ${PC_LUAJIT_INCLUDE_DIRS}
75-
PATH_SUFFIXES luajit-2.0 luajit-2.1)
76-
77-
if(MSVC)
78-
list(APPEND LUAJIT_NAMES lua51)
79-
elseif(MINGW)
80-
list(APPEND LUAJIT_NAMES libluajit libluajit-5.1)
81-
else()
82-
list(APPEND LUAJIT_NAMES luajit-5.1)
83-
endif()
84-
85-
find_library(LUAJIT_LIBRARY NAMES ${LUAJIT_NAMES}
86-
PATHS ${PC_LUAJIT_LIBDIR} ${PC_LUAJIT_LIBRARY_DIRS})
87-
88-
set(LUAJIT_LIBRARIES ${LUAJIT_LIBRARY})
89-
set(LUAJIT_INCLUDE_DIRS ${LUAJIT_INCLUDE_DIR})
90-
91-
include(FindPackageHandleStandardArgs)
92-
# handle the QUIETLY and REQUIRED arguments and set LUAJIT_FOUND to TRUE
93-
# if all listed variables are TRUE
94-
find_package_handle_standard_args(LuaJit DEFAULT_MSG
95-
LUAJIT_LIBRARY LUAJIT_INCLUDE_DIR)
96-
97-
mark_as_advanced(LUAJIT_INCLUDE_DIR LUAJIT_LIBRARY)
66+
find_package(PkgConfig)
67+
if (PKG_CONFIG_FOUND)
68+
pkg_check_modules(PC_LUAJIT QUIET luajit)
69+
endif()
70+
71+
set(LUAJIT_DEFINITIONS ${PC_LUAJIT_CFLAGS_OTHER})
72+
73+
find_path(LUAJIT_INCLUDE_DIR luajit.h
74+
PATHS ${PC_LUAJIT_INCLUDEDIR} ${PC_LUAJIT_INCLUDE_DIRS}
75+
PATH_SUFFIXES luajit-2.0 luajit-2.1)
76+
77+
if(MSVC)
78+
list(APPEND LUAJIT_NAMES lua51)
79+
elseif(MINGW)
80+
list(APPEND LUAJIT_NAMES libluajit libluajit-5.1)
81+
else()
82+
list(APPEND LUAJIT_NAMES luajit-5.1)
83+
endif()
84+
85+
find_library(LUAJIT_LIBRARY NAMES ${LUAJIT_NAMES}
86+
PATHS ${PC_LUAJIT_LIBDIR} ${PC_LUAJIT_LIBRARY_DIRS})
87+
88+
set(LUAJIT_LIBRARIES ${LUAJIT_LIBRARY})
89+
set(LUAJIT_INCLUDE_DIRS ${LUAJIT_INCLUDE_DIR})
90+
91+
include(FindPackageHandleStandardArgs)
92+
# handle the QUIETLY and REQUIRED arguments and set LUAJIT_FOUND to TRUE
93+
# if all listed variables are TRUE
94+
find_package_handle_standard_args(LuaJit DEFAULT_MSG
95+
LUAJIT_LIBRARY LUAJIT_INCLUDE_DIR)
96+
97+
mark_as_advanced(LUAJIT_INCLUDE_DIR LUAJIT_LIBRARY)
9898
endif()

0 commit comments

Comments
 (0)