#At file:///Users/jan/projects/in-bzr/conn-c/trunk/ based on revid:georg.richter@stripped
2893 jan@stripped 2009-12-04
added out-of-tree build support
modified:
CMakeLists.txt
extlib/dbug/CMakeLists.txt
extlib/regex/CMakeLists.txt
libmysql/CMakeLists.txt
mysql_config/CMakeLists.txt
mysys/CMakeLists.txt
strings/CMakeLists.txt
tests/CMakeLists.txt
unittest/examples/CMakeLists.txt
unittest/libmysql/CMakeLists.txt
unittest/mysys/CMakeLists.txt
unittest/mytap/CMakeLists.txt
vio/CMakeLists.txt
=== modified file 'CMakeLists.txt'
--- a/CMakeLists.txt revid:georg.richter@stripped
+++ b/CMakeLists.txt revid:jan@stripped
@@ -367,12 +367,12 @@ ENDIF(NOT EXTRA_NAME_SUFFIX)
SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Connector/C (libmysql), a library for connecting to MySQL servers.")
SET(CPACK_PACKAGE_NAME "mysql-connector-c${EXTRA_NAME_SUFFIX}")
SET(CPACK_PACKAGE_VENDOR "Sun Microsystems, Inc.")
-IF(EXISTS "COPYING")
- SET(CPACK_RESOURCE_FILE_LICENSE "COPYING")
-ELSE(EXISTS "COPYING")
- SET(CPACK_RESOURCE_FILE_LICENSE "LICENSE.mysql")
-ENDIF(EXISTS "COPYING")
-SET(CPACK_PACKAGE_DESCRIPTION_FILE "README")
+IF(EXISTS "${CMAKE_SOURCE_DIR}/COPYING")
+ SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/COPYING")
+ELSE(EXISTS "${CMAKE_SOURCE_DIR}/COPYING")
+ SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/LICENSE.mysql")
+ENDIF(EXISTS "${CMAKE_SOURCE_DIR}/COPYING")
+SET(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_SOURCE_DIR}/README")
SET(CPACK_SOURCE_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CONNECTOR_C_VERSION}")
SET(CPACK_PACKAGE_INSTALL_DIRECTORY "${CPACK_PACKAGE_NAME}-${CONNECTOR_C_VERSION}-${CONNECTOR_PLATFORM}")
IF(WIN32)
@@ -389,6 +389,6 @@ SET(CPACK_SOURCE_IGNORE_FILES
"/_CPack_Packages"
"/CMakeCache.txt")
-INSTALL(FILES "README" "COPYING" "LICENSE.mysql" "EXCEPTIONS-CLIENT" "ChaneLog" DESTINATION "." OPTIONAL)
+INSTALL(FILES "README" "COPYING" "LICENSE.mysql" "EXCEPTIONS-CLIENT" "ChangeLog" DESTINATION "." OPTIONAL)
INCLUDE(CPack)
=== modified file 'extlib/dbug/CMakeLists.txt'
--- a/extlib/dbug/CMakeLists.txt revid:georg.richter@stripped
+++ b/extlib/dbug/CMakeLists.txt revid:jan@stripped
@@ -19,5 +19,6 @@ SET(DBUG_SOURCES dbug.c factorial.c sani
IF(NOT SOURCE_SUBLIBS)
INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include)
+ INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR}/include)
ADD_LIBRARY(dbug ${DBUG_SOURCES})
ENDIF(NOT SOURCE_SUBLIBS)
=== modified file 'extlib/regex/CMakeLists.txt'
--- a/extlib/regex/CMakeLists.txt revid:georg.richter@stripped
+++ b/extlib/regex/CMakeLists.txt revid:jan@stripped
@@ -15,6 +15,7 @@
INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include)
+INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR}/include)
SET(REGEX_SOURCES debug.c regcomp.c regerror.c regexec.c regfree.c reginit.c split.c)
=== modified file 'libmysql/CMakeLists.txt'
--- a/libmysql/CMakeLists.txt revid:georg.richter@stripped
+++ b/libmysql/CMakeLists.txt revid:jan@stripped
@@ -23,6 +23,7 @@ INCLUDE("${CMAKE_SOURCE_DIR}/libmysql/CM
INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include
${CMAKE_SOURCE_DIR}/libmysql
+ ${CMAKE_BINARY_DIR}/include
${CMAKE_SOURCE_DIR}/regex
${CMAKE_SOURCE_DIR}/sql
${CMAKE_SOURCE_DIR}/strings)
=== modified file 'mysql_config/CMakeLists.txt'
--- a/mysql_config/CMakeLists.txt revid:georg.richter@stripped
+++ b/mysql_config/CMakeLists.txt revid:jan@stripped
@@ -14,6 +14,7 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include)
+INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR}/include)
# Figure out additional libraries for use with -lmysql
FOREACH (dep ${libmysql_LIB_DEPENDS})
@@ -35,7 +36,7 @@ ENDIF(UNIX)
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/mysql_config.c.in
${CMAKE_CURRENT_BINARY_DIR}/mysql_config.c @ONLY)
-ADD_EXECUTABLE(mysql_config mysql_config.c)
+ADD_EXECUTABLE(mysql_config ${CMAKE_CURRENT_BINARY_DIR}/mysql_config.c)
TARGET_LINK_LIBRARIES(mysql_config mysqlclient)
# Installation
=== modified file 'mysys/CMakeLists.txt'
--- a/mysys/CMakeLists.txt revid:georg.richter@stripped
+++ b/mysys/CMakeLists.txt revid:jan@stripped
@@ -42,6 +42,7 @@ IF(NOT SOURCE_SUBLIBS)
INCLUDE_DIRECTORIES(${ZLIB_INCLUDE_DIR}
${CMAKE_SOURCE_DIR}/include
+ ${CMAKE_BINARY_DIR}/include
${CMAKE_SOURCE_DIR}/mysys)
ADD_LIBRARY(mysys ${MYSYS_SOURCES})
=== modified file 'strings/CMakeLists.txt'
--- a/strings/CMakeLists.txt revid:georg.richter@stripped
+++ b/strings/CMakeLists.txt revid:jan@stripped
@@ -30,6 +30,7 @@ IF(NOT SOURCE_SUBLIBS)
"${CMAKE_C_FLAGS_DEBUG} -D_DEBUG -DSAFEMALLOC -DSAFE_MUTEX")
INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include)
+ INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR}/include)
ADD_LIBRARY(strings ${STRINGS_SOURCES})
ENDIF(NOT SOURCE_SUBLIBS)
=== modified file 'tests/CMakeLists.txt'
--- a/tests/CMakeLists.txt revid:georg.richter@stripped
+++ b/tests/CMakeLists.txt revid:jan@stripped
@@ -16,6 +16,7 @@
ADD_DEFINITIONS("-DMYSQL_CLIENT")
INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include)
+INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR}/include)
ADD_EXECUTABLE(mysql_client_test mysql_client_test.c ../mysys/my_memmem.c)
TARGET_LINK_LIBRARIES(mysql_client_test mysqlclient)
=== modified file 'unittest/examples/CMakeLists.txt'
--- a/unittest/examples/CMakeLists.txt revid:georg.richter@stripped
+++ b/unittest/examples/CMakeLists.txt revid:jan@stripped
@@ -16,6 +16,7 @@
INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include ${CMAKE_SOURCE_DIR}/zlib
${CMAKE_SOURCE_DIR}/sql
+ ${CMAKE_BINARY_DIR}/include
${CMAKE_SOURCE_DIR}/regex
${CMAKE_SOURCE_DIR}/extra/yassl/include
${CMAKE_SOURCE_DIR}/unittest/mytap)
=== modified file 'unittest/libmysql/CMakeLists.txt'
--- a/unittest/libmysql/CMakeLists.txt revid:georg.richter@stripped
+++ b/unittest/libmysql/CMakeLists.txt revid:jan@stripped
@@ -19,6 +19,7 @@ SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_F
SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX")
INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include
+ ${CMAKE_BINARY_DIR}/include
${CMAKE_SOURCE_DIR}/unittest/mytap)
SET(API_TESTS "basic-t" "fetch" "charset" "logs" "errors" "cursor" "view" "ps" "ps_bugs"
=== modified file 'unittest/mysys/CMakeLists.txt'
--- a/unittest/mysys/CMakeLists.txt revid:georg.richter@stripped
+++ b/unittest/mysys/CMakeLists.txt revid:jan@stripped
@@ -20,6 +20,7 @@ SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS
INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include ${CMAKE_SOURCE_DIR}/zlib
${CMAKE_SOURCE_DIR}/regex
+ ${CMAKE_BINARY_DIR}/include
${CMAKE_SOURCE_DIR}/extra/yassl/include
${CMAKE_SOURCE_DIR}/unittest/mytap)
=== modified file 'unittest/mytap/CMakeLists.txt'
--- a/unittest/mytap/CMakeLists.txt revid:georg.richter@stripped
+++ b/unittest/mytap/CMakeLists.txt revid:jan@stripped
@@ -16,6 +16,7 @@
INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include ${CMAKE_SOURCE_DIR}/zlib
${CMAKE_SOURCE_DIR}/sql
+ ${CMAKE_BINARY_DIR}/include
${CMAKE_SOURCE_DIR}/regex
${CMAKE_SOURCE_DIR}/extra/yassl/include)
ADD_LIBRARY(mytap tap.c)
=== modified file 'vio/CMakeLists.txt'
--- a/vio/CMakeLists.txt revid:georg.richter@stripped
+++ b/vio/CMakeLists.txt revid:jan@stripped
@@ -23,6 +23,7 @@ IF(NOT SOURCE_SUBLIBS)
ADD_DEFINITIONS(-DUSE_SYMDIR)
INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include
+ ${CMAKE_BINARY_DIR}/include
${CMAKE_SOURCE_DIR}/extlib/yassl/include)
ADD_LIBRARY(vio ${VIO_SOURCES})
Attachment: [text/bzr-bundle] bzr/jan@mysql.com-20091204114512-l5ftebbsovp7xa0j.bundle
| Thread |
|---|
| • bzr commit into libmysql branch (jan:2893) | jan | 12 Mar 2010 |
