mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-07-16 04:17:25 +00:00
Paul Eggleton
e751af9f90
* Upstream switched from autotools to cmake * Separate build dir and parallel make now work * Library versioning no longer used for plugins; other libtool cruft gone * Proper upstream initscript * Plugins moved from client library package to mariadb-server package (matches how Fedora packages these) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
30 lines
1001 B
Diff
30 lines
1001 B
Diff
Avoid CMAKE_MODULE_PATH being overwritten
|
|
|
|
OE-Core's setting of CMAKE_MODULE_PATH stomps on MariaDB's value unless
|
|
we set it after setting the project name.
|
|
|
|
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
|
|
|
|
Upstream-Status: Inappropriate [working around OE-Core bug]
|
|
|
|
--- mariadb/CMakeLists.txt 2014-07-17 11:01:07.676353047 +0100
|
|
+++ mariadb/CMakeLists.txt 2014-07-17 11:01:31.299353107 +0100
|
|
@@ -28,8 +28,6 @@
|
|
|
|
MESSAGE(STATUS "Running cmake version ${CMAKE_VERSION}")
|
|
|
|
-SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake)
|
|
-
|
|
# Distinguish between community and non-community builds, with the
|
|
# default being a community build. This does not impact the feature
|
|
# set that will be compiled in; it's merely provided as a hint to
|
|
@@ -77,6 +75,8 @@
|
|
ENDIF()
|
|
PROJECT(${MYSQL_PROJECT_NAME})
|
|
|
|
+SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake)
|
|
+
|
|
IF(BUILD_CONFIG)
|
|
INCLUDE(
|
|
${CMAKE_SOURCE_DIR}/cmake/build_configurations/${BUILD_CONFIG}.cmake)
|