diff options
| author | Vanilla I. Shu <vanilla@FreeBSD.org> | 2015-09-23 02:30:42 +0000 |
|---|---|---|
| committer | Vanilla I. Shu <vanilla@FreeBSD.org> | 2015-09-23 02:30:42 +0000 |
| commit | 4324473ccff939fe32d6745599af7c62a6c536d0 (patch) | |
| tree | c2e6fb9f8c3bff92930fc19275e611ac37b705b7 /databases/mysql-connector-c++/files | |
| parent | 1: Upgrade to 4.14. (diff) | |
Upgrade to 1.1.6.
Notes
Notes:
svn path=/head/; revision=397603
Diffstat (limited to 'databases/mysql-connector-c++/files')
| -rw-r--r-- | databases/mysql-connector-c++/files/patch-CMakeLists.txt | 18 | ||||
| -rw-r--r-- | databases/mysql-connector-c++/files/patch-cppconn_CMakeLists.txt | 15 |
2 files changed, 9 insertions, 24 deletions
diff --git a/databases/mysql-connector-c++/files/patch-CMakeLists.txt b/databases/mysql-connector-c++/files/patch-CMakeLists.txt index f726a75a5d27..7c36e8acfea5 100644 --- a/databases/mysql-connector-c++/files/patch-CMakeLists.txt +++ b/databases/mysql-connector-c++/files/patch-CMakeLists.txt @@ -1,8 +1,8 @@ ---- CMakeLists.txt.orig 2014-07-24 20:53:44.000000000 +0200 -+++ CMakeLists.txt 2014-07-29 12:53:28.000000000 +0200 -@@ -261,14 +261,6 @@ - SET(CPACK_GENERATOR "TGZ") - ENDIF(WIN32) +--- CMakeLists.txt.orig 2015-06-04 12:58:30 UTC ++++ CMakeLists.txt +@@ -305,14 +305,6 @@ IF(RPM_LAYOUT) + SET(DOC_DESTINATION "share/doc/${CPACK_PACKAGE_NAME}-${MYSQLCPPCONN_VERSION}") + ENDIF() -INSTALL(FILES - ${CPACK_RESOURCE_FILE_README} @@ -10,8 +10,8 @@ - ${CPACK_RESOURCE_FILE_LICENSE} - "${CMAKE_SOURCE_DIR}/Licenses_for_Third-Party_Components.txt" - "${CMAKE_SOURCE_DIR}/ANNOUNCEMENT" -- DESTINATION "." OPTIONAL) +- DESTINATION ${DOC_DESTINATION} OPTIONAL) - - SET(COMMON_IGNORE_FILES "/CMakeFiles/" "/Testing/" "/.bzr/" "_CPack_Packages/" - "~" ".swp" ".log" ".gz" ".directory$" "CMakeCache.txt" "Makefile" - "install_manifest.txt") + SET(COMMON_IGNORE_FILES + "/CMakeFiles/" + "/Testing/" diff --git a/databases/mysql-connector-c++/files/patch-cppconn_CMakeLists.txt b/databases/mysql-connector-c++/files/patch-cppconn_CMakeLists.txt deleted file mode 100644 index 3d5a1d333bae..000000000000 --- a/databases/mysql-connector-c++/files/patch-cppconn_CMakeLists.txt +++ /dev/null @@ -1,15 +0,0 @@ ---- cppconn/CMakeLists.txt.orig 2012-08-09 10:30:25.000000000 +0200 -+++ cppconn/CMakeLists.txt 2012-08-09 10:31:01.000000000 +0200 -@@ -58,7 +58,6 @@ - - SET(MYSQLCPPCONN_INSTALL_HEADERS - build_config.h -- config.h - connection.h - datatype.h - driver.h -@@ -73,3 +72,4 @@ - warning.h) - - INSTALL(FILES ${MYSQLCPPCONN_INSTALL_HEADERS} DESTINATION include/cppconn) -+INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/config.h DESTINATION include/cppconn) |