buaazp: use new findlibmemcached.cmake

netaudio · Jun 6, 2014 · 34e3cbd · 34e3cbd
1 parent 07baa2a
commit 34e3cbd
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 46 deletions.
diff --git a/.gitignore b/.gitignore
@@ -40,3 +40,8 @@ build/
 src/include/evhtp-config.h
 src/hiredis.c
 results.bin
+
+test/result.json
+test/stress_random.txt
+test/stress_random_big.txt
+test/zimg with webimg2.txt
diff --git a/.travis.yml b/.travis.yml
@@ -2,6 +2,9 @@ Language: c
 compiler:
     - gcc
     - clang
+branches:
+    only:
+        - master
 before_install:
     - sudo apt-get update -qq
 install:

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -100,17 +100,16 @@ if (NOT EVHTP_DISABLE_REGEX)
         set (ONIG_INCLUDE_DIR "")
     endif (NOT HAS_SYS_ONIG)
 else()
-    set(ONIG_SOURCES "")
-    set(ONIG_LIBS "")
-    set(ONIG_INCLUDE_DIR "")
+    set (ONIG_SOURCES "")
+    set (ONIG_LIBS "")
+    set (ONIG_INCLUDE_DIR "")
 endif()
 
-find_package(ImageMagick COMPONENTS MagickWand REQUIRED)
-find_package(LibMemcached REQUIRED)
-
+find_package (ImageMagick COMPONENTS MagickWand REQUIRED)
+find_package (LibMemcached REQUIRED)
 
 if (NOT OPENSSL_FOUND)
-	message("Diabling SSL")
+	message ("Diabling SSL")
 	set (EVHTP_DISABLE_SSL ON)
 	set (OPENSSL_CRYPTO_LIBRARY "")
 	set (OPENSSL_INCLUDE_DIR "")
@@ -122,7 +121,7 @@ endif()
 include_directories(
 	${OPENSSL_INCLUDE_DIR}
 	${LIBEVENT_INCLUDE_DIR}
-    ${LIBMEMCACHED_INCLUDE_DIR}
+    ${LIBMEMCACHED_INCLUDE_DIRS}
     ${ImageMagick_INCLUDE_DIRS}
 )
 
@@ -132,7 +131,7 @@ set(ZIMG_EXTERNAL_LIBS
     ${LIBEVENT_OPENSSL_LIBRARY}
     ${OPENSSL_LIBRARIES}
     ${ImageMagick_MagickWand_LIBRARY}
-    ${LIBMEMCACHED_LIBRARY}
+    ${LIBMEMCACHED_LIBRARIES}
 )
 
 if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
@@ -152,26 +151,17 @@ set(LIBEVHTP_SOURCES ${LIBEVHTP_SOURCES} libevhtp/evhtp.c libevhtp/htparse.c)
 aux_source_directory (${PROJECT_SOURCE_DIR} ZIMG_SOURCES)
 aux_source_directory (${PROJECT_SOURCE_DIR}/hiredis LIBHIREDIS_SOURCE_DIR)
 aux_source_directory (${PROJECT_SOURCE_DIR}/lua LIBLUA_SOURCE_DIR)
-set (SOURCES ${ZIMG_SOURCES} ${LIBEVHTP_SOURCES} ${LIBHIREDIS_SOURCE_DIR} ${LIBLUA_SOURCE_DIR})
+aux_source_directory (${PROJECT_SOURCE_DIR}/webimg LIBWEBIMG_SOURCE_DIR)
+set (SOURCES ${ZIMG_SOURCES} ${LIBEVHTP_SOURCES} ${LIBHIREDIS_SOURCE_DIR} ${LIBLUA_SOURCE_DIR} ${LIBWEBIMG_SOURCE_DIR})
 
 if (${CMAKE_BUILD_TYPE} STREQUAL "Debug")
-  set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DDEBUG")
+  set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -O0 -DDEBUG")
 endif (${CMAKE_BUILD_TYPE} STREQUAL "Debug")
 
-#if (EVHTP_DISABLE_SSL)
-#    set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DEVHTP_DISABLE_SSL:STRING=ON")
-#    set (CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG}    -DEVHTP_DISABLE_SSL:STRING=ON")
-#    set (CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE}    -DEVHTP_DISABLE_SSL:STRING=ON")
-#endif()
-
 set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DLUA_USE_LINUX -DLUA_ANSI -DZIMG_VERSION=${PROJECT_VERSION} -DMAGICKCORE_HDRI_ENABLE -DMAGICKCORE_QUANTUM_DEPTH=16")
-#set (CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -DLUA_USE_LINUX -DLUA_ANSI -DDEBUG -DZIMG_VERSION=${PROJECT_VERSION} -DMAGICKCORE_HDRI_ENABLE -DMAGICKCORE_QUANTUM_DEPTH=16")
-#set (CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -DLUA_USE_LINUX -DLUA_ANSI -DZIMG_VERSION=${PROJECT_VERSION} -DMAGICKCORE_HDRI_ENABLE -DMAGICKCORE_QUANTUM_DEPTH=16")
 
 message("Build Type: ${CMAKE_BUILD_TYPE}")
 message("Std CFLAGS: ${CMAKE_C_FLAGS}")
-#message("Dbg CFLAGS: ${CMAKE_C_FLAGS_DEBUG}")
-#message("Rel CFLAGS: ${CMAKE_C_FLAGS_RELEASE}")
 
 set(CMAKE_EXE_LINKER_FLAGS "-L/usr/lib -L/usr/local/lib")
 

diff --git a/src/CMakeModules/FindLibMemcached.cmake b/src/CMakeModules/FindLibMemcached.cmake
@@ -4,33 +4,26 @@
 # LIBMEMCACHED_INCLUDE_DIR - the libmemcached include directory
 # LIBMEMCACHED_LIBRARIES   - The libraries needed to use libmemcached
 
+IF (LIBMEMCACHED_INCLUDE_DIRS)
+  # Already in cache, be silent
+  SET(LIBMEMCACHED_FIND_QUIETLY TRUE)
+ENDIF ()
+
 FIND_PATH(LIBMEMCACHED_INCLUDE_DIR libmemcached/memcached.h)
 
-FIND_LIBRARY(LIBMEMCACHED_LIBRARY NAMES memcached libmemcached PATH /usr/lib /usr/local/lib)
+FIND_LIBRARY(LIBMEMCACHED_LIBRARY memcached)
 
-IF(LIBMEMCACHED_INCLUDE_DIR AND LIBMEMCACHED_LIBRARY)
-	SET(LIBMEMCACHED_FOUND 1)
-	SET(LIBMEMCACHED_LIBRARIES ${LIBMEMCACHED_LIBRARY})
-	SET(LIBMEMCACHED_INCLUDE_DIRS ${LIBMEMCACHED_INCLUDE_DIR})
-ELSE (LIBMEMCACHED_INCLUDE_DIR AND LIBMEMCACHED_LIBRARY)
-	SET(LIBMEMCACHED_FOUND 0)
-	SET(LIBMEMCACHED_LIBRARIES)
-	SET(LIBMEMCACHED_INCLUDE_DIRS)
-ENDIF (LIBMEMCACHED_INCLUDE_DIR AND LIBMEMCACHED_LIBRARY)
+# handle the QUIETLY and REQUIRED arguments and set Libmemcached_FOUND to TRUE if 
+# all listed variables are TRUE
+INCLUDE(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(Libmemcached DEFAULT_MSG LIBMEMCACHED_LIBRARY LIBMEMCACHED_INCLUDE_DIR)
 
-# Report the results.
-IF (NOT LIBMEMCACHED_FOUND)
-	SET(LIBMEMCACHED_DIR_MESSAGE "Libmemcached was not found.")
-	IF (NOT LIBMEMCACHED_FIND_QUIETLY)
-		MESSAGE(STATUS "${LIBMEMCACHED_DIR_MESSAGE}")
-	ELSE (NOT LIBMEMCACHED_FIND_QUIETLY)
-		IF (LIBMEMCACHED_FIND_REQUIRED)
-			MESSAGE(FATAL_ERROR "${LIBMEMCACHED_DIR_MESSAGE}")
-		ENDIF (LIBMEMCACHED_FIND_REQUIRED)
-	ENDIF (NOT LIBMEMCACHED_FIND_QUIETLY)
-ENDIF (NOT LIBMEMCACHED_FOUND)
+IF(LIBMEMCACHED_FOUND)
+  SET(LIBMEMCACHED_LIBRARIES ${LIBMEMCACHED_LIBRARY})
+  SET(LIBMEMCACHED_INCLUDE_DIRS ${LIBMEMCACHED_INCLUDE_DIR})
+ELSE()
+  SET(LIBMEMCACHED_LIBRARIES)
+  SET(LIBMEMCACHED_INCLUDE_DIRS)
+ENDIF()
 
-MARK_AS_ADVANCED(
-	LIBMEMCACHED_LIBRARY
-	LIBMEMCACHED_INCLUDE_DIR
-)
+MARK_AS_ADVANCED(LIBMEMCACHED_LIBRARIES LIBMEMCACHED_INCLUDE_DIRS)