Skip to content
This repository was archived by the owner on Apr 6, 2019. It is now read-only.

Commit f494ab3

Browse files
whoshuuCylix
authored andcommitted
Use uniform CMake spacing and capitalization (#127)
1 parent ecf670a commit f494ab3

File tree

3 files changed

+40
-39
lines changed

3 files changed

+40
-39
lines changed

CMakeLists.txt

+32-32
Original file line numberDiff line numberDiff line change
@@ -44,33 +44,33 @@ project(${PROJECT} CXX)
4444
###
4545
# compilation options
4646
###
47-
IF (WIN32)
47+
if(WIN32)
4848
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W3 /O2 /bigobj")
4949

5050
# was causing conflics with gtest build
5151
string(REPLACE "/RTC1" "" CMAKE_CXX_FLAGS_DEBUG ${CMAKE_CXX_FLAGS_DEBUG})
5252

53-
IF ("${MSVC_RUNTIME_LIBRARY_CONFIG}" STREQUAL "")
53+
if("${MSVC_RUNTIME_LIBRARY_CONFIG}" STREQUAL "")
5454
set(MSVC_RUNTIME_LIBRARY_CONFIG "/MT")
55-
ENDIF()
55+
endif()
5656

57-
foreach (flag_var CMAKE_CXX_FLAGS CMAKE_CXX_FLAGS_DEBUG CMAKE_CXX_FLAGS_RELEASE)
58-
IF ("${MSVC_RUNTIME_LIBRARY_CONFIG}" STREQUAL "/MT")
57+
foreach(flag_var CMAKE_CXX_FLAGS CMAKE_CXX_FLAGS_DEBUG CMAKE_CXX_FLAGS_RELEASE)
58+
if("${MSVC_RUNTIME_LIBRARY_CONFIG}" STREQUAL "/MT")
5959
string(REPLACE "/MD" "/MT" ${flag_var} "${${flag_var}}")
60-
ELSEIF ("${MSVC_RUNTIME_LIBRARY_CONFIG}" STREQUAL "/MD")
60+
elseif("${MSVC_RUNTIME_LIBRARY_CONFIG}" STREQUAL "/MD")
6161
string(REPLACE "/MT" "/MD" ${flag_var} "${${flag_var}}")
62-
ELSE ()
62+
else()
6363
string(REPLACE "/MD" "${MSVC_RUNTIME_LIBRARY_CONFIG}" ${flag_var} "${${flag_var}}")
6464
string(REPLACE "/MT" "${MSVC_RUNTIME_LIBRARY_CONFIG}" ${flag_var} "${${flag_var}}")
65-
ENDIF()
65+
endif()
6666
endforeach()
6767

6868
add_definitions(-D_UNICODE)
6969
add_definitions(-DUNICODE)
7070
add_definitions(-DWIN32_LEAN_AND_MEAN)
71-
ELSE ()
71+
else()
7272
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -W -Wall -Wextra -O3")
73-
ENDIF (WIN32)
73+
endif(WIN32)
7474

7575

7676
###
@@ -113,9 +113,9 @@ foreach(dir ${SRC_DIRS})
113113
set(SOURCES ${SOURCES} ${s_${dir}} ${h_${dir}} ${i_${dir}})
114114
endforeach()
115115
# filter tcp_client if no tacopie
116-
IF (USE_CUSTOM_TCP_CLIENT)
116+
if(USE_CUSTOM_TCP_CLIENT)
117117
list(REMOVE_ITEM SRC_DIRS "source/network/tcp_client.cpp" "include/cpp_redis/network/tcp_client.hpp")
118-
ENDIF (USE_CUSTOM_TCP_CLIENT)
118+
endif(USE_CUSTOM_TCP_CLIENT)
119119

120120

121121
###
@@ -136,39 +136,39 @@ configure_file("cpp_redis.pc.in" "${CMAKE_PKGCONFIG_OUTPUT_DIRECTORY}/cpp_redis.
136136
###
137137
add_library(${PROJECT} ${SOURCES})
138138

139-
if (WIN32)
139+
if(WIN32)
140140
set_target_properties(${PROJECT}
141141
PROPERTIES COMPILE_PDB_NAME ${PROJECT}
142142
COMPILE_PDB_OUTPUT_DIRECTORY ${CMAKE_LIBRARY_OUTPUT_DIRECTORY})
143-
ENDIF (WIN32)
143+
endif(WIN32)
144144

145-
IF (WIN32)
145+
if(WIN32)
146146
target_link_libraries(${PROJECT} ws2_32)
147-
ELSE ()
147+
else()
148148
target_link_libraries(${PROJECT} pthread)
149-
ENDIF (WIN32)
149+
endif(WIN32)
150150

151-
if (TACOPIE_LIBRARY)
151+
if(TACOPIE_LIBRARY)
152152
target_link_libraries(${PROJECT} ${TACOPIE_LIBRARY})
153153
else()
154154
target_link_libraries(${PROJECT} tacopie)
155155
endif(TACOPIE_LIBRARY)
156156

157157

158158
# __CPP_REDIS_READ_SIZE
159-
IF (READ_SIZE)
159+
if(READ_SIZE)
160160
set_target_properties(${PROJECT} PROPERTIES COMPILE_DEFINITIONS "__CPP_REDIS_READ_SIZE=${READ_SIZE}")
161-
ENDIF (READ_SIZE)
161+
endif(READ_SIZE)
162162

163163
# __CPP_REDIS_LOGGING_ENABLED
164-
IF (LOGGING_ENABLED)
164+
if(LOGGING_ENABLED)
165165
set_target_properties(${PROJECT} PROPERTIES COMPILE_DEFINITIONS "__CPP_REDIS_LOGGING_ENABLED=${LOGGING_ENABLED}")
166-
ENDIF (LOGGING_ENABLED)
166+
endif(LOGGING_ENABLED)
167167

168168
# __CPP_REDIS_USE_CUSTOM_TCP_CLIENT
169-
IF (USE_CUSTOM_TCP_CLIENT)
169+
if(USE_CUSTOM_TCP_CLIENT)
170170
set_target_properties(${PROJECT} PROPERTIES COMPILE_DEFINITIONS "__CPP_REDIS_USE_CUSTOM_TCP_CLIENT=${USE_CUSTOM_TCP_CLIENT}")
171-
ENDIF (USE_CUSTOM_TCP_CLIENT)
171+
endif(USE_CUSTOM_TCP_CLIENT)
172172

173173

174174
###
@@ -186,29 +186,29 @@ install(DIRECTORY ${CPP_REDIS_INCLUDES}/ DESTINATION include USE_SOURCE_PERMISSI
186186
###
187187
# examples
188188
###
189-
IF (BUILD_EXAMPLES)
189+
if(BUILD_EXAMPLES)
190190
add_subdirectory(examples)
191191
# Reset variable to false to ensure tacopie does no build examples
192-
set (BUILD_EXAMPLES false)
193-
ENDIF(BUILD_EXAMPLES)
192+
set(BUILD_EXAMPLES false)
193+
endif(BUILD_EXAMPLES)
194194

195195
###
196196
# tests
197197
###
198-
IF (BUILD_TESTS)
198+
if(BUILD_TESTS)
199199
enable_testing()
200200
add_subdirectory(tests)
201201
ExternalProject_Add("googletest"
202202
GIT_REPOSITORY "https://github.com/google/googletest.git"
203203
CMAKE_ARGS "-DCMAKE_INSTALL_PREFIX=${PROJECT_SOURCE_DIR}/deps")
204204
# Reset variable to false to ensure tacopie does no build tests
205-
set (BUILD_TESTS false)
206-
ENDIF(BUILD_TESTS)
205+
set(BUILD_TESTS false)
206+
endif(BUILD_TESTS)
207207

208208

209209
###
210210
# tacopie
211211
###
212-
IF (NOT TACOPIE_LIBRARY AND NOT USE_CUSTOM_TCP_CLIENT)
212+
if(NOT TACOPIE_LIBRARY AND NOT USE_CUSTOM_TCP_CLIENT)
213213
add_subdirectory(tacopie)
214-
ENDIF (NOT TACOPIE_LIBRARY AND NOT USE_CUSTOM_TCP_CLIENT)
214+
endif(NOT TACOPIE_LIBRARY AND NOT USE_CUSTOM_TCP_CLIENT)

examples/CMakeLists.txt

+6-5
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@
2323
###
2424
# compilation options
2525
###
26-
IF (NOT WIN32)
26+
if(NOT WIN32)
2727
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
28-
ENDIF (NOT WIN32)
28+
endif(NOT WIN32)
2929

3030

3131
###
@@ -61,21 +61,22 @@ target_link_libraries(cpp_redis_kill cpp_redis)
6161
add_executable(cpp_redis_high_availability_client cpp_redis_high_availability_client.cpp)
6262
target_link_libraries(cpp_redis_high_availability_client cpp_redis)
6363

64+
6465
###
6566
# link libs
6667
###
67-
IF (WIN32)
68+
if(WIN32)
6869
target_link_libraries(cpp_redis_client ws2_32)
6970
target_link_libraries(cpp_redis_future_client ws2_32)
7071
target_link_libraries(cpp_redis_subscriber ws2_32)
7172
target_link_libraries(cpp_redis_logger ws2_32)
7273
target_link_libraries(cpp_redis_kill ws2_32)
7374
target_link_libraries(cpp_redis_high_availability_client ws2_32)
74-
ELSE ()
75+
else()
7576
target_link_libraries(cpp_redis_client pthread)
7677
target_link_libraries(cpp_redis_future_client pthread)
7778
target_link_libraries(cpp_redis_subscriber pthread)
7879
target_link_libraries(cpp_redis_logger pthread)
7980
target_link_libraries(cpp_redis_kill pthread)
8081
target_link_libraries(cpp_redis_high_availability_client pthread)
81-
ENDIF (WIN32)
82+
endif(WIN32)

tests/CMakeLists.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@ project(${PROJECT} CXX)
3030
###
3131
# compilation options
3232
###
33-
IF (NOT WIN32)
33+
if(NOT WIN32)
3434
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
35-
ENDIF (NOT WIN32)
35+
endif(NOT WIN32)
3636

3737

3838
###

0 commit comments

Comments
 (0)