Merge pull request #447 from Barenboim/master

update cmake

GNUmakefile

@@ -6,11 +6,6 @@ DEFAULT_BUILD_DIR := build
 BUILD_DIR := $(shell if [ -f $(MAKE_FILE) ]; then echo "."; else echo $(DEFAULT_BUILD_DIR); fi)
 CMAKE3 := $(shell if which cmake3>/dev/null ; then echo cmake3; else echo cmake; fi;)
 
-KAFKA 		?= n
-MYSQL 		?= y
-REDIS 		?= y
-UPSTREAM 	?= y
-
 .PHONY: $(ALL_TARGETS)
 
 all: base

src/client/CMakeLists.txt

@@ -5,7 +5,7 @@ set(SRC
 	WFDnsClient.cc
 )
 
-if (MYSQL STREQUAL "y")
+if (NOT MYSQL STREQUAL "n")
 	set(SRC
 		${SRC}
 		WFMySQLConnection.cc

src/factory/CMakeLists.txt

@@ -9,14 +9,14 @@ set(SRC
 	HttpTaskImpl.cc
 )
 
-if (MYSQL STREQUAL "y")
+if (NOT MYSQL STREQUAL "n")
 	set(SRC
 		${SRC}
 		MySQLTaskImpl.cc
 	)
 endif ()
 
-if (REDIS STREQUAL "y")
+if (NOT REDIS STREQUAL "n")
 	set(SRC
 		${SRC}
 		RedisTaskImpl.cc

src/manager/CMakeLists.txt

@@ -7,7 +7,7 @@ set(SRC
 	WFGlobal.cc
 )
 
-if (UPSTREAM STREQUAL "y")
+if (NOT UPSTREAM STREQUAL "n")
 	set(SRC
 		${SRC}
 		UpstreamManager.cc

src/nameservice/CMakeLists.txt

@@ -6,7 +6,7 @@ set(SRC
 	WFDnsResolver.cc
 )
 
-if (UPSTREAM STREQUAL "y")
+if (NOT UPSTREAM STREQUAL "n")
 	set(SRC
 		${SRC}
 		WFServiceGovernance.cc

src/protocol/CMakeLists.txt

@@ -11,7 +11,7 @@ set(SRC
 	HttpUtil.cc
 )
 
-if (MYSQL STREQUAL "y")
+if (NOT MYSQL STREQUAL "n")
 	set(SRC
 		${SRC}
 		mysql_stream.c
@@ -22,7 +22,7 @@ if (MYSQL STREQUAL "y")
 	)
 endif ()
 
-if (REDIS STREQUAL "y")
+if (NOT REDIS STREQUAL "n")
 	set(SRC
 		${SRC}
 		redis_parser.c

src/server/CMakeLists.txt

@@ -5,7 +5,7 @@ set(SRC
 	WFServer.cc
 )
 
-if (MYSQL STREQUAL "y")
+if (NOT MYSQL STREQUAL "n")
 	set(SRC
 		${SRC}
 		WFMySQLServer.cc

tutorial/CMakeLists.txt

@@ -47,7 +47,7 @@ foreach(src ${TUTORIAL_LIST})
 	target_link_libraries(${bin_name} ${WORKFLOW_LIB})
 endforeach()
 
-if (REDIS STREQUAL "y")
+if (NOT REDIS STREQUAL "n")
 set(TUTORIAL_LIST
 	tutorial-02-redis_cli
 	tutorial-03-wget_to_redis
@@ -60,7 +60,7 @@ foreach(src ${TUTORIAL_LIST})
 endforeach()
 endif()
 
-if (MYSQL STREQUAL "y")
+if (NOT MYSQL STREQUAL "n")
 set(TUTORIAL_LIST
 	tutorial-12-mysql_cli
 )