Cleaned up CMakeFiles and configuration generation

LuaDist · Jul 31, 2012 · f3dd157 · f3dd157
1 parent 5e2105e
commit f3dd157
Show file tree

Hide file tree

Showing 17 changed files with 166 additions and 196 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,2 @@
+extlib/yassl/include/config.h
+include/my_config.h
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -13,7 +13,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-cmake_minimum_required ( VERSION 2.8 )
+cmake_minimum_required ( VERSION 2.8.0 )
 if ( COMMAND CMAKE_POLICY )
   cmake_policy ( SET CMP0003 NEW )
 endif ( COMMAND CMAKE_POLICY )
@@ -284,7 +284,7 @@ else ( WIN32 AND ( CMAKE_GENERATOR MATCHES "MSYS" OR CMAKE_GENERATOR MATCHES "Mi
 endif ( WIN32 AND ( CMAKE_GENERATOR MATCHES "MSYS" OR CMAKE_GENERATOR MATCHES "MinGW" 
   ) )
 
-include ( ${CMAKE_SOURCE_DIR}/CMakePlatformTests.txt )
+include ( configure )
 configure_file ( ${CMAKE_CURRENT_SOURCE_DIR}/include/my_config.h.in ${CMAKE_CURRENT_SOURCE_DIR}/include/my_config.h )
 
 if ( HAVE_SSIZE_T )
@@ -342,6 +342,8 @@ enable_testing ( )
 
 file ( GLOB HEADERS include/*.h )
 install_header ( ${HEADERS} )
+#install ( DIRECTORY "include/" DESTINATION ${INSTALL_INC} FILES_MATCHING PATTERN 
+#  "*.h" )
 
 # ----------------------------------------------------------------------
 # Create package script
@@ -388,6 +390,4 @@ endif ( NOT CONNECTOR_PLATFORM )
 # SET(CPACK_PACKAGE_FILE_NAME         "${CPACK_PACKAGE_INSTALL_DIRECTORY}")
 # ENDIF(WIN32)
 
-install_data ( README COPYING ChaneLog )
+install_data ( README COPYING )
-
-include ( CPack )
diff --git a/CMakePlatformTests.txt → cmake/configure.cmake b/CMakePlatformTests.txt → cmake/configure.cmake
diff --git a/extlib/dbug/CMakeLists.txt b/extlib/dbug/CMakeLists.txt
@@ -13,11 +13,11 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/dbug)
+include_directories ( ${CMAKE_SOURCE_DIR}/dbug )
 
-SET(DBUG_SOURCES dbug.c factorial.c sanity.c)
+set ( DBUG_SOURCES dbug.c factorial.c sanity.c )
 
-IF(NOT SOURCE_SUBLIBS)
+if ( NOT SOURCE_SUBLIBS )
-  INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include)
+  include_directories ( ${CMAKE_SOURCE_DIR}/include )
-  ADD_LIBRARY(dbug ${DBUG_SOURCES})
+  add_library ( dbug ${DBUG_SOURCES} )
-ENDIF(NOT SOURCE_SUBLIBS)
+endif ( NOT SOURCE_SUBLIBS )
diff --git a/extlib/regex/CMakeLists.txt b/extlib/regex/CMakeLists.txt
@@ -13,11 +13,10 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
+include_directories ( ${CMAKE_SOURCE_DIR}/include )
 
-INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include)
+set ( REGEX_SOURCES debug.c regcomp.c regerror.c regexec.c regfree.c reginit.c split.c )
 
-SET(REGEX_SOURCES debug.c regcomp.c regerror.c regexec.c regfree.c reginit.c split.c)
+if ( NOT SOURCE_SUBLIBS )
-
+  add_library ( regex STATIC ${REGEX_SOURCES} )
-IF(NOT SOURCE_SUBLIBS)
+endif ( NOT SOURCE_SUBLIBS )
-  ADD_LIBRARY(regex ${REGEX_SOURCES})
-ENDIF(NOT SOURCE_SUBLIBS)
diff --git a/extlib/yassl/CMakeLists.txt b/extlib/yassl/CMakeLists.txt
@@ -13,23 +13,20 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/include/my_config.h.in
+configure_file ( ${CMAKE_SOURCE_DIR}/include/my_config.h.in ${CMAKE_SOURCE_DIR}/extlib/yassl/include/config.h )
-               ${CMAKE_SOURCE_DIR}/extlib/yassl/include/config.h)
+add_definitions ( "-DHAVE_CONFIG_H" )
-ADD_DEFINITIONS("-DHAVE_CONFIG_H")
 
-INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/extlib/yassl/include
+include_directories ( ${CMAKE_SOURCE_DIR}/extlib/yassl/include ${CMAKE_SOURCE_DIR}/extlib/yassl/taocrypt/include 
-                    ${CMAKE_SOURCE_DIR}/extlib/yassl/taocrypt/include
+  ${CMAKE_SOURCE_DIR}/extlib/yassl/taocrypt/mySTL ${CMAKE_SOURCE_DIR}/include )
-                    ${CMAKE_SOURCE_DIR}/extlib/yassl/taocrypt/mySTL
-					${CMAKE_SOURCE_DIR}/include)
 
-ADD_DEFINITIONS("-D_LIB -DYASSL_PREFIX")
+add_definitions ( "-D_LIB -DYASSL_PREFIX" )
 
-SET(YASSL_SOURCES  src/buffer.cpp src/cert_wrapper.cpp src/crypto_wrapper.cpp src/handshake.cpp src/lock.cpp 
+set ( YASSL_SOURCES src/buffer.cpp src/cert_wrapper.cpp src/crypto_wrapper.cpp src/handshake.cpp 
-				src/log.cpp src/socket_wrapper.cpp src/ssl.cpp src/timer.cpp src/yassl_error.cpp 
+  src/lock.cpp src/log.cpp src/socket_wrapper.cpp src/ssl.cpp src/timer.cpp src/yassl_error.cpp 
-				src/yassl_imp.cpp src/yassl_int.cpp)
+  src/yassl_imp.cpp src/yassl_int.cpp )
 
-SET_SOURCE_FILES_PROPERTIES(${YASSL_SOURCES} LANGUAGE C)
+set_source_files_properties ( ${YASSL_SOURCES} LANGUAGE C )
 
-IF(NOT SOURCE_SUBLIBS)
+if ( NOT SOURCE_SUBLIBS )
-  ADD_LIBRARY(yassl ${YASSL_SOURCES})
+  add_library ( yassl STATIC ${YASSL_SOURCES} )
-ENDIF(NOT SOURCE_SUBLIBS)
+endif ( NOT SOURCE_SUBLIBS )
diff --git a/extlib/yassl/taocrypt/CMakeLists.txt b/extlib/yassl/taocrypt/CMakeLists.txt
@@ -13,24 +13,23 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/extlib/yassl/taocrypt/mySTL
+include_directories ( ${CMAKE_SOURCE_DIR}/extlib/yassl/taocrypt/mySTL ${CMAKE_SOURCE_DIR}/extlib/yassl/taocrypt/include 
-                    ${CMAKE_SOURCE_DIR}/extlib/yassl/taocrypt/include
+  ${CMAKE_SOURCE_DIR}/extlib/yassl/include ${CMAKE_SOURCE_DIR}/include )
-                    ${CMAKE_SOURCE_DIR}/extlib/yassl/include
-                    ${CMAKE_SOURCE_DIR}/include)
 
-ADD_DEFINITIONS("-DHAVE_CONFIG_H")
+add_definitions ( "-DHAVE_CONFIG_H" )
 
-SET(TAOCRYPT_SOURCES		src/aes.cpp src/aestables.cpp src/algebra.cpp src/arc4.cpp src/asn.cpp src/coding.cpp 
+set ( TAOCRYPT_SOURCES src/aes.cpp src/aestables.cpp src/algebra.cpp src/arc4.cpp 
-				src/des.cpp src/dh.cpp src/dsa.cpp src/file.cpp src/hash.cpp src/integer.cpp src/md2.cpp 
+  src/asn.cpp src/coding.cpp src/des.cpp src/dh.cpp src/dsa.cpp src/file.cpp src/hash.cpp 
-				src/md4.cpp src/md5.cpp src/misc.cpp src/random.cpp src/ripemd.cpp src/rsa.cpp src/sha.cpp
+  src/integer.cpp src/md2.cpp src/md4.cpp src/md5.cpp src/misc.cpp src/random.cpp 
-				include/aes.hpp include/algebra.hpp include/arc4.hpp include/asn.hpp include/block.hpp 
+  src/ripemd.cpp src/rsa.cpp src/sha.cpp include/aes.hpp include/algebra.hpp include/arc4.hpp 
-				include/coding.hpp include/des.hpp include/dh.hpp include/dsa.hpp include/dsa.hpp
+  include/asn.hpp include/block.hpp include/coding.hpp include/des.hpp include/dh.hpp 
-				include/error.hpp include/file.hpp include/hash.hpp include/hmac.hpp include/integer.hpp 
+  include/dsa.hpp include/dsa.hpp include/error.hpp include/file.hpp include/hash.hpp 
-				include/md2.hpp include/md5.hpp include/misc.hpp include/modarith.hpp include/modes.hpp
+  include/hmac.hpp include/integer.hpp include/md2.hpp include/md5.hpp include/misc.hpp 
-				include/random.hpp include/ripemd.hpp include/rsa.hpp include/sha.hpp)
+  include/modarith.hpp include/modes.hpp include/random.hpp include/ripemd.hpp include/rsa.hpp 
+  include/sha.hpp )
 
-SET_SOURCE_FILES_PROPERTIES(${TAOCRYPT_SOURCES} LANGUAGE C)
+set_source_files_properties ( ${TAOCRYPT_SOURCES} LANGUAGE C )
 
-IF(NOT SOURCE_SUBLIBS)
+if ( NOT SOURCE_SUBLIBS )
-  ADD_LIBRARY(taocrypt ${TAOCRYPT_SOURCES})
+  add_library ( taocrypt ${TAOCRYPT_SOURCES} )
-ENDIF(NOT SOURCE_SUBLIBS)
+endif ( NOT SOURCE_SUBLIBS )
diff --git a/extlib/zlib/CMakeLists.txt b/extlib/zlib/CMakeLists.txt
@@ -18,14 +18,13 @@
 # Not directly and indirectly using any of the macros for creating and
 # using the storage, pthread_key*(), {,my_}{set,get}_specific*() ....
 
-INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/extlib/zlib)
+include_directories ( ${CMAKE_SOURCE_DIR}/extlib/zlib )
 
-SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -D_DEBUG")
+set ( CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -D_DEBUG" )
 
-SET(ZLIB_SOURCES  adler32.c compress.c crc32.c crc32.h deflate.c deflate.h
+set ( ZLIB_SOURCES adler32.c compress.c crc32.c crc32.h deflate.c deflate.h gzio.c 
-                  gzio.c infback.c inffast.c inffast.h inffixed.h inflate.c
+  infback.c inffast.c inffast.h inffixed.h inflate.c inflate.h inftrees.c inftrees.h 
-                  inflate.h inftrees.c inftrees.h trees.c trees.h uncompr.c
+  trees.c trees.h uncompr.c zconf.h zlib.h zutil.c zutil.h )
-                  zconf.h zlib.h zutil.c zutil.h)
+if ( NOT SOURCE_SUBLIBS )
-IF(NOT SOURCE_SUBLIBS)
+  add_library ( zlib ${ZLIB_SOURCES} )
-  ADD_LIBRARY(zlib ${ZLIB_SOURCES})
+endif ( NOT SOURCE_SUBLIBS )
-ENDIF(NOT SOURCE_SUBLIBS)
diff --git a/mysql_config/CMakeLists.txt b/mysql_config/CMakeLists.txt
@@ -13,25 +13,24 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include)
+include_directories ( ${CMAKE_SOURCE_DIR}/include )
 
 # Figure out additional libraries for use with -lmysql
-FOREACH (dep ${libmysql_LIB_DEPENDS})
+foreach ( dep ${libmysql_LIB_DEPENDS} )
-  STRING(REGEX MATCH "^-.*$" out "${dep}")
+string ( REGEX MATCH "^-.*$" out "${dep}" )
-  IF(out)
+if ( out )
-    SET(extra_dynamic_LDFLAGS "${extra_dynamic_LDFLAGS} ${dep}")
+  set ( extra_dynamic_LDFLAGS "${extra_dynamic_LDFLAGS} ${dep}" )
-  ENDIF(out)
+endif ( out )
-ENDFOREACH(dep)
+endforeach ( dep )
 
-STRING(REGEX REPLACE "\([^\\]\) " "\\1\\\\ " CMAKE_INSTALL_PREFIX_ESCAPED "${CMAKE_INSTALL_PREFIX}")
+string ( REGEX REPLACE "\([^\\]\) " "\\1\\\\ " CMAKE_INSTALL_PREFIX_ESCAPED "${CMAKE_INSTALL_PREFIX}" )
 
-CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/mysql_config.c.in
+configure_file ( ${CMAKE_CURRENT_SOURCE_DIR}/mysql_config.c.in ${CMAKE_CURRENT_BINARY_DIR}/mysql_config.c 
-               ${CMAKE_CURRENT_BINARY_DIR}/mysql_config.c @ONLY)
+  @ONLY )
 
-ADD_EXECUTABLE(mysql_config mysql_config.c)
+add_executable ( mysql_config mysql_config.c )
-TARGET_LINK_LIBRARIES(mysql_config mysql ${WIN32_ADD_LIBRARIES})
+target_link_libraries ( mysql_config mysql ${WIN32_ADD_LIBRARIES} )
 
 # Installation
 #
-INSTALL(TARGETS mysql_config
+install ( TARGETS mysql_config DESTINATION ${INSTALL_BIN} )
-        DESTINATION ${INSTALL_BIN})
diff --git a/mysys/CMakeLists.txt b/mysys/CMakeLists.txt
@@ -13,42 +13,34 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-SET(MYSYS_SOURCES  array.c charset-def.c charset.c checksum.c default.c default_modify.c
+set ( MYSYS_SOURCES array.c charset-def.c charset.c checksum.c default.c default_modify.c 
-				errors.c hash.c list.c md5.c mf_brkhant.c mf_cache.c mf_dirname.c mf_fn_ext.c
+  errors.c hash.c list.c md5.c mf_brkhant.c mf_cache.c mf_dirname.c mf_fn_ext.c mf_format.c 
-				mf_format.c mf_getdate.c mf_iocache.c mf_iocache2.c mf_keycache.c my_safehash.c
+  mf_getdate.c mf_iocache.c mf_iocache2.c mf_keycache.c my_safehash.c mf_keycaches.c 
-				mf_keycaches.c mf_loadpath.c mf_pack.c mf_path.c mf_qsort.c mf_qsort2.c
+  mf_loadpath.c mf_pack.c mf_path.c mf_qsort.c mf_qsort2.c mf_radix.c mf_same.c mf_sort.c 
-				mf_radix.c mf_same.c mf_sort.c mf_soundex.c mf_strip.c mf_arr_appstr.c mf_tempdir.c
+  mf_soundex.c mf_strip.c mf_arr_appstr.c mf_tempdir.c mf_tempfile.c mf_unixpath.c 
-				mf_tempfile.c mf_unixpath.c mf_wcomp.c mf_wfile.c mulalloc.c my_access.c
+  mf_wcomp.c mf_wfile.c mulalloc.c my_access.c my_aes.c my_alarm.c my_alloc.c my_append.c 
-				my_aes.c my_alarm.c my_alloc.c my_append.c my_bit.c my_bitmap.c my_chmod.c my_chsize.c
+  my_bit.c my_bitmap.c my_chmod.c my_chsize.c my_clock.c my_compress.c my_conio.c 
-				my_clock.c my_compress.c my_conio.c my_copy.c my_create.c my_delete.c
+  my_copy.c my_create.c my_delete.c my_div.c my_error.c my_file.c my_fopen.c my_fstream.c 
-				my_div.c my_error.c my_file.c my_fopen.c my_fstream.c my_gethostbyname.c 
+  my_gethostbyname.c my_gethwaddr.c my_getopt.c my_getsystime.c my_getwd.c my_init.c 
-				my_gethwaddr.c my_getopt.c my_getsystime.c my_getwd.c my_init.c
+  my_lib.c my_lock.c my_lockmem.c my_malloc.c my_messnc.c my_dup.c my_mkdir.c my_mmap.c 
-				my_lib.c my_lock.c my_lockmem.c my_malloc.c my_messnc.c my_dup.c
+  my_net.c my_once.c my_open.c my_pread.c my_pthread.c my_quick.c my_read.c my_realloc.c 
-				my_mkdir.c my_mmap.c my_net.c my_once.c my_open.c my_pread.c my_pthread.c 
+  my_redel.c my_rename.c my_seek.c my_sleep.c my_static.c my_symlink.c my_symlink2.c 
-				my_quick.c my_read.c my_realloc.c my_redel.c my_rename.c my_seek.c my_sleep.c
+  my_sync.c my_thr_init.c my_wincond.c my_winerr.c my_winfile.c my_windac.c my_winthread.c 
-				my_static.c my_symlink.c my_symlink2.c my_sync.c my_thr_init.c my_wincond.c
+  my_write.c ptr_cmp.c queues.c stacktrace.c rijndael.c safemalloc.c sha1.c string.c 
-                my_winerr.c my_winfile.c
+  thr_alarm.c thr_lock.c thr_mutex.c thr_rwlock.c tree.c typelib.c my_vle.c base64.c 
-				my_windac.c my_winthread.c my_write.c ptr_cmp.c queues.c stacktrace.c
+  my_memmem.c my_getpagesize.c lf_alloc-pin.c lf_dynarray.c lf_hash.c my_atomic.c 
-				rijndael.c safemalloc.c sha1.c string.c thr_alarm.c thr_lock.c thr_mutex.c
+  my_getncpus.c my_rnd.c my_uuid.c wqueue.c waiting_threads.c my_port.c )
-				thr_rwlock.c tree.c typelib.c my_vle.c base64.c my_memmem.c my_getpagesize.c
-                                lf_alloc-pin.c lf_dynarray.c lf_hash.c
-                                my_atomic.c my_getncpus.c my_rnd.c
-                                my_uuid.c wqueue.c waiting_threads.c my_port.c
-)
 
-IF(NOT SOURCE_SUBLIBS)
+if ( NOT SOURCE_SUBLIBS )
-  SET(CMAKE_C_FLAGS_DEBUG
+  set ( CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX" )
-      "${CMAKE_C_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX")
 
-  INCLUDE_DIRECTORIES(${ZLIB_INCLUDE_DIR}
+  include_directories ( ${ZLIB_INCLUDE_DIR} ${CMAKE_SOURCE_DIR}/include ${CMAKE_SOURCE_DIR}/mysys )
-                      ${CMAKE_SOURCE_DIR}/include
-                      ${CMAKE_SOURCE_DIR}/mysys)
 
-  ADD_LIBRARY(mysys ${MYSYS_SOURCES})
+  add_library ( mysys STATIC ${MYSYS_SOURCES} )
-  TARGET_LINK_LIBRARIES(mysys ${CMAKE_THREAD_LIBS_INIT})
+  target_link_libraries ( mysys ${CMAKE_THREAD_LIBS_INIT} )
 
-  IF(MATH_LIBRARY)
+  if ( MATH_LIBRARY )
-    TARGET_LINK_LIBRARIES(mysys ${MATH_LIBRARY})
+    target_link_libraries ( mysys ${MATH_LIBRARY} )
-  ENDIF(MATH_LIBRARY)
+  endif ( MATH_LIBRARY )
 
-ENDIF(NOT SOURCE_SUBLIBS)
+endif ( NOT SOURCE_SUBLIBS )
diff --git a/strings/CMakeLists.txt b/strings/CMakeLists.txt
@@ -13,23 +13,19 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-SET(STRINGS_SOURCES bchange.c bcmp.c bfill.c bmove512.c bmove_upp.c ctype-big5.c ctype-bin.c ctype-cp932.c
+set ( STRINGS_SOURCES bchange.c bcmp.c bfill.c bmove512.c bmove_upp.c ctype-big5.c 
-                ctype-czech.c ctype-euc_kr.c ctype-eucjpms.c ctype-extra.c ctype-gb2312.c ctype-gbk.c
+  ctype-bin.c ctype-cp932.c ctype-czech.c ctype-euc_kr.c ctype-eucjpms.c ctype-extra.c 
-                ctype-latin1.c ctype-mb.c ctype-simple.c ctype-sjis.c ctype-tis620.c ctype-uca.c
+  ctype-gb2312.c ctype-gbk.c ctype-latin1.c ctype-mb.c ctype-simple.c ctype-sjis.c 
-                ctype-ucs2.c ctype-ujis.c ctype-utf8.c ctype-win1250ch.c ctype.c decimal.c int2str.c
+  ctype-tis620.c ctype-uca.c ctype-ucs2.c ctype-ujis.c ctype-utf8.c ctype-win1250ch.c 
-                is_prefix.c llstr.c longlong2str.c my_strtoll10.c my_vsnprintf.c r_strinstr.c
+  ctype.c decimal.c int2str.c is_prefix.c llstr.c longlong2str.c my_strtoll10.c my_vsnprintf.c 
-                str2int.c str_alloc.c strcend.c strend.c strfill.c strmake.c strmov.c strnmov.c 
+  r_strinstr.c str2int.c str_alloc.c strcend.c strend.c strfill.c strmake.c strmov.c 
-                strtol.c strtoll.c strtoul.c strtoull.c strxmov.c strxnmov.c xml.c dtoa.c
+  strnmov.c strtol.c strtoll.c strtoul.c strtoull.c strxmov.c strxnmov.c xml.c dtoa.c 
-                my_strchr.c strcont.c strinstr.c strnlen.c
+  my_strchr.c strcont.c strinstr.c strnlen.c strappend.c )
-                strappend.c)
+if ( NOT SOURCE_SUBLIBS )
-
+  set ( CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -D_DEBUG -DSAFEMALLOC -DSAFE_MUTEX" )
-IF(NOT SOURCE_SUBLIBS)
+  set ( CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -D_DEBUG -DSAFEMALLOC -DSAFE_MUTEX" )
-  SET(CMAKE_CXX_FLAGS_DEBUG
-      "${CMAKE_CXX_FLAGS_DEBUG} -D_DEBUG -DSAFEMALLOC -DSAFE_MUTEX")
-  SET(CMAKE_C_FLAGS_DEBUG
-      "${CMAKE_C_FLAGS_DEBUG} -D_DEBUG -DSAFEMALLOC -DSAFE_MUTEX")
 
-  INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include)
+  include_directories ( ${CMAKE_SOURCE_DIR}/include )
 
-  ADD_LIBRARY(strings ${STRINGS_SOURCES})
+  add_library ( strings STATIC ${STRINGS_SOURCES} )
-ENDIF(NOT SOURCE_SUBLIBS)
+endif ( NOT SOURCE_SUBLIBS )
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -13,9 +13,9 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-ADD_DEFINITIONS("-DMYSQL_CLIENT")
+add_definitions ( "-DMYSQL_CLIENT" )
 
-INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include)
+include_directories ( ${CMAKE_SOURCE_DIR}/include )
 
-ADD_EXECUTABLE(mysql_client_test mysql_client_test.c ../mysys/my_memmem.c)
+add_executable ( mysql_client_test mysql_client_test.c ../mysys/my_memmem.c )
-TARGET_LINK_LIBRARIES(mysql_client_test mysql ${WIN32_ADD_LIBRARIES})
+target_link_libraries ( mysql_client_test mysql ${WIN32_ADD_LIBRARIES} )
diff --git a/unittest/examples/CMakeLists.txt b/unittest/examples/CMakeLists.txt
@@ -13,27 +13,23 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
+include_directories ( ${CMAKE_SOURCE_DIR}/include ${CMAKE_SOURCE_DIR}/zlib ${CMAKE_SOURCE_DIR}/sql 
+  ${CMAKE_SOURCE_DIR}/regex ${CMAKE_SOURCE_DIR}/extra/yassl/include ${CMAKE_SOURCE_DIR}/unittest/mytap )
 
-INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include ${CMAKE_SOURCE_DIR}/zlib
+add_executable ( simple-t simple-t.c )
-                    ${CMAKE_SOURCE_DIR}/sql
+target_link_libraries ( simple-t mytap ${WIN32_ADD_LIBRARIES} )
-                    ${CMAKE_SOURCE_DIR}/regex
-                    ${CMAKE_SOURCE_DIR}/extra/yassl/include
-                    ${CMAKE_SOURCE_DIR}/unittest/mytap)
 
-ADD_EXECUTABLE(simple-t simple-t.c)
+add_executable ( skip-t skip-t.c )
-TARGET_LINK_LIBRARIES(simple-t mytap ${WIN32_ADD_LIBRARIES})
+target_link_libraries ( skip-t mytap ${WIN32_ADD_LIBRARIES} )
 
-ADD_EXECUTABLE(skip-t skip-t.c)
+add_executable ( todo-t todo-t.c )
-TARGET_LINK_LIBRARIES(skip-t mytap ${WIN32_ADD_LIBRARIES})
+target_link_libraries ( todo-t mytap ${WIN32_ADD_LIBRARIES} )
 
-ADD_EXECUTABLE(todo-t todo-t.c)
+add_executable ( skip_all-t skip_all-t.c )
-TARGET_LINK_LIBRARIES(todo-t mytap ${WIN32_ADD_LIBRARIES})
+target_link_libraries ( skip_all-t mytap ${WIN32_ADD_LIBRARIES} )
 
-ADD_EXECUTABLE(skip_all-t skip_all-t.c)
+add_executable ( no_plan-t no_plan-t.c )
-TARGET_LINK_LIBRARIES(skip_all-t mytap ${WIN32_ADD_LIBRARIES})
+target_link_libraries ( no_plan-t mytap ${WIN32_ADD_LIBRARIES} )
 
-ADD_EXECUTABLE(no_plan-t no_plan-t.c)
+add_executable ( core-t core-t.c )
-TARGET_LINK_LIBRARIES(no_plan-t mytap ${WIN32_ADD_LIBRARIES})
+target_link_libraries ( core-t mytap ${WIN32_ADD_LIBRARIES} )
-
-ADD_EXECUTABLE(core-t core-t.c)
-TARGET_LINK_LIBRARIES(core-t mytap ${WIN32_ADD_LIBRARIES})