[libmariadb] rollback conflict with libmysql

microsoft · Jan 25, 2017 · 8fd59c5 · 8fd59c5
1 parent 033c7d0
commit 8fd59c5
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/ports/libmariadb/portfile.cmake b/ports/libmariadb/portfile.cmake
@@ -1,3 +1,8 @@
+
+if (EXISTS "${CURRENT_INSTALLED_DIR}/include/mysql/mysql.h")
+	message(FATAL_ERROR "FATAL ERROR: libmysql and libmariadb are incompatible.")
+endif()
+
 include(vcpkg_common_functions)
 set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/mariadb-connector-c-2.3.2)
 
@@ -57,6 +62,9 @@ file(REMOVE
 	${CURRENT_PACKAGES_DIR}/include/mariadb/mysql_version.h.in
 	${CURRENT_PACKAGES_DIR}/include/mariadb/CMakeLists.txt
 	${CURRENT_PACKAGES_DIR}/include/mariadb/Makefile.am)
+file(RENAME
+	${CURRENT_PACKAGES_DIR}/include/mariadb
+	${CURRENT_PACKAGES_DIR}/include/mysql)
 
 # copy license file
 file(COPY ${SOURCE_PATH}/COPYING.LIB DESTINATION ${CURRENT_PACKAGES_DIR}/share/libmariadb)

diff --git a/ports/libmysql/portfile.cmake b/ports/libmysql/portfile.cmake
@@ -1,3 +1,7 @@
+if (EXISTS "${CURRENT_INSTALLED_DIR}/include/mysql/mysql.h")
+	message(FATAL_ERROR "FATAL ERROR: libmysql and libmariadb are incompatible.")
+endif()
+
 include(vcpkg_common_functions)
 set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/mysql-server-mysql-5.7.17)