diff options
| author | Florian Smeets <flo@FreeBSD.org> | 2013-06-09 14:54:38 +0000 |
|---|---|---|
| committer | Florian Smeets <flo@FreeBSD.org> | 2013-06-09 14:54:38 +0000 |
| commit | a355832cfb17fe662f1c0d946a3447cb2fbfa27a (patch) | |
| tree | 3cd89d6759452ebadf6449ebd467a2eade341243 /databases/mariadb55-server/files/patch-sql_CMakeLists.txt | |
| parent | Add build dependency on boost for shibboleth and opensaml. (diff) | |
Update to 5.5.31
PR: ports/179425
Submitted by: Alexandr Kovalenko <never@nevermind.kiev.ua>
Diffstat (limited to 'databases/mariadb55-server/files/patch-sql_CMakeLists.txt')
| -rw-r--r-- | databases/mariadb55-server/files/patch-sql_CMakeLists.txt | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/databases/mariadb55-server/files/patch-sql_CMakeLists.txt b/databases/mariadb55-server/files/patch-sql_CMakeLists.txt index af5a85695bd6..47e93ad71348 100644 --- a/databases/mariadb55-server/files/patch-sql_CMakeLists.txt +++ b/databases/mariadb55-server/files/patch-sql_CMakeLists.txt @@ -1,14 +1,14 @@ ---- sql/CMakeLists.txt.orig 2012-11-28 17:49:47.000000000 +0200 -+++ sql/CMakeLists.txt 2012-12-23 05:56:58.000000000 +0200 +--- sql/CMakeLists.txt.orig 2013-05-22 01:09:51.000000000 +0300 ++++ sql/CMakeLists.txt 2013-06-08 14:13:06.000000000 +0300 @@ -268,6 +268,7 @@ + VERBATIM + ) +IF(FALSE) IF(INSTALL_LAYOUT STREQUAL "STANDALONE") - # We need to create empty directories (data/test) the installation. - # This does not work with current CPack due to http://www.cmake.org/Bug/view.php?id=8767 - # Avoid completely empty directories and install dummy file instead. -@@ -313,6 +314,7 @@ + # Copy db.opt into data/test/ +@@ -311,6 +312,7 @@ INSTALL(FILES ${DUMMY_FILE} DESTINATION data/mysql COMPONENT DataFiles) ENDIF(WIN32 AND MYSQLD_EXECUTABLE) ENDIF(INSTALL_LAYOUT STREQUAL "STANDALONE") @@ -16,7 +16,7 @@ IF(WIN32) SET(my_bootstrap_sql ${CMAKE_CURRENT_BINARY_DIR}/my_bootstrap.sql) -@@ -354,8 +356,10 @@ +@@ -353,8 +355,10 @@ TARGET_LINK_LIBRARIES(mysql_upgrade_service mysys winservice) ENDIF(WIN32) |