View | Details | Raw Unified | Return to bug 197185 | Differences between
and this patch

Collapse All | Expand All

(-)mariadb100-client/files/patch-extra_CMakeLists.txt (-5 / +13 lines)
Lines 1-5 Link Here
1 
--- extra/CMakeLists.txt.orig	2012-12-17 03:38:29.000000000 +0200
 1 
--- extra/CMakeLists.txt.orig	2015-01-25 16:21:40.000000000 +0100
2 
+++ extra/CMakeLists.txt	2012-12-17 03:40:12.000000000 +0200
 2 
+++ extra/CMakeLists.txt	2015-01-29 20:20:56.846047266 +0100
3 
@@ -54,6 +54,7 @@
 3 
@@ -54,6 +54,7 @@
4 
                   DEPENDS
4 
                   DEPENDS
5 
                   ${CMAKE_BINARY_DIR}/include/mysqld_error.h.tmp)
 5 
                   ${CMAKE_BINARY_DIR}/include/mysqld_error.h.tmp)
Lines 8-14 Link Here
8 
 MYSQL_ADD_EXECUTABLE(my_print_defaults my_print_defaults.c)
 8 
 MYSQL_ADD_EXECUTABLE(my_print_defaults my_print_defaults.c)
9 
 TARGET_LINK_LIBRARIES(my_print_defaults  mysys)
 9 
 TARGET_LINK_LIBRARIES(my_print_defaults  mysys)
10
10
11 
@@ -74,11 +75,14 @@
 11 
@@ -74,9 +75,12 @@
12
12
13 
 MYSQL_ADD_EXECUTABLE(replace replace.c COMPONENT Server)
 13 
 MYSQL_ADD_EXECUTABLE(replace replace.c COMPONENT Server)
14 
 TARGET_LINK_LIBRARIES(replace mysys)
 14 
 TARGET_LINK_LIBRARIES(replace mysys)
Lines 15-22 Link Here
15 
+ENDIF()
 15 
+ENDIF()
16 
 IF(UNIX)
 16 
 IF(UNIX)
17 
+IF(FALSE)
 17 
+IF(FALSE)
18 
   MYSQL_ADD_EXECUTABLE(innochecksum innochecksum.c)
19
20 
   MYSQL_ADD_EXECUTABLE(resolve_stack_dump resolve_stack_dump.c)
 18 
   MYSQL_ADD_EXECUTABLE(resolve_stack_dump resolve_stack_dump.c)
21 
   TARGET_LINK_LIBRARIES(resolve_stack_dump mysys)
 19 
   TARGET_LINK_LIBRARIES(resolve_stack_dump mysys)
22 
+ENDIF()
 20 
+ENDIF()
Lines 23-25 Link Here
23
21
24 
   MYSQL_ADD_EXECUTABLE(mysql_waitpid mysql_waitpid.c COMPONENT Client)
 22 
   MYSQL_ADD_EXECUTABLE(mysql_waitpid mysql_waitpid.c COMPONENT Client)
25 
   TARGET_LINK_LIBRARIES(mysql_waitpid mysys)
 23 
   TARGET_LINK_LIBRARIES(mysql_waitpid mysys)
24 
@@ -97,7 +101,9 @@
25 
       ../storage/innobase/page/page0zip.cc
26 
       )
27
28 
+IF(FALSE)
29 
   MYSQL_ADD_EXECUTABLE(innochecksum innochecksum.cc ${INNOBASE_SOURCES})
30 
   TARGET_LINK_LIBRARIES(innochecksum mysys mysys_ssl)
31 
   ADD_DEPENDENCIES(innochecksum GenError)
32 
+ENDIF()
33

Return to bug 197185