CMake: Remove some extraneous definitions for autotools

This removes some definitions from the compiler line which shouldn't
really be needed for building with CMake

Change-Id: Ic358ce1c48e89010ffe14292f16c3e64cf11a597
Reviewed-on: http://review.couchbase.org/43717
Reviewed-by: Sergey Avseyev <sergey.avseyev@gmail.com>
Tested-by: Mark Nunberg <mnunberg@haskalah.org>

CMakeLists.txt

@@ -32,7 +32,6 @@ SET(COUCHBASE_MOCK_VERSION
 # Maven repository where ${COUCHBASE_MOCK_VERSION} is to be found
 SET(COUCHBASE_MOCK_DLSERVER
     http://files.couchbase.com/maven2/org/couchbase/mock/CouchbaseMock)
-SET(HAVE_COUCHBASEMOCK 1)
 project(libcouchbase)
 
 OPTION(LCB_NO_TESTS "Disable building of tests" OFF)

cmake/config-cmake.h.in

@@ -1,12 +1,3 @@
-#ifndef PACKAGE_STRING
-#define PACKAGE_STRING "libcouchbase"
-#endif
-#ifndef PACKAGE_NAME
-#define PACKAGE_NAME "libcouchbase"
-#endif
-#ifndef PACKAGE_VERSION
-#define PACKAGE_VERSION LCB_VERSION_STRING
-#endif
 #ifdef _WIN32
 #define CONFIG_H
 #define HAVE_WINSOCK2_H
@@ -18,11 +9,6 @@
 #ifndef CONFIG_H
 #define CONFIG_H
 
-#cmakedefine LCB_BUILD_PLUGINS
-#ifdef LCB_BUILD_PLUGINS
-#define BUILD_PLUGINS 1
-#endif
-
 #cmakedefine HAVE_CLOCK_GETTIME
 #cmakedefine HAVE_COUCHBASEMOCK
 #cmakedefine HAVE_DLFCN_H
@@ -50,9 +36,6 @@
 #cmakedefine HAVE_WINSOCK2_H
 #cmakedefine HAVE_WS2TCPIP_H
 #cmakedefine HAVE_ARPA_INET_H
-#cmakedefine PACKAGE_STRING
-#cmakedefine PACKAGE_NAME
-#cmakedefine PACKAGE_VERSION
 
 #ifndef HAVE_LIBEVENT
 #cmakedefine HAVE_LIBEVENT

tests/CMakeLists.txt

@@ -66,13 +66,6 @@ ELSE()
     ADD_EXECUTABLE(unit-tests EXCLUDE_FROM_ALL ${T_IO_SRC} unit_tests.cc $<TARGET_OBJECTS:mocksupport>)
 ENDIF()
 
-# Normally defined by config.h
-SET_PROPERTY(
-    TARGET unit-tests
-    APPEND PROPERTY COMPILE_DEFINITIONS
-    BUILD_PLUGINS
-    )
-
 IF(CMAKE_COMPILER_IS_GNUCXX)
     SET_TARGET_PROPERTIES(unit-tests
         PROPERTIES

tests/check-all.cc

@@ -44,11 +44,7 @@
 #define TESTS_BASE "sock-tests;nonio-tests;rdb-tests;mc-tests;"
 #define PLUGIN_ENV_VAR "LCB_IOPS_NAME"
 #define LCB_SRCROOT_ENV_VAR "srcdir"
-#ifdef HAVE_COUCHBASEMOCK
 #define DEFAULT_TEST_NAMES TESTS_BASE "unit-tests"
-#else
-#define DEFAULT_TEST_NAMES TESTS_BASE
-#endif
 
 #ifdef _WIN32
 const char default_plugins_string[] = "select;iocp;libuv";