Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
MariaDB
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
58a6b9eb
Commit
58a6b9eb
authored
Nov 22, 2015
by
Sergei Golubchik
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
cmake: message_once
parent
4f84d9ce
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
16 additions
and
9 deletions
+16
-9
CMakeLists.txt
CMakeLists.txt
+1
-0
cmake/misc.cmake
cmake/misc.cmake
+6
-0
cmake/ssl.cmake
cmake/ssl.cmake
+7
-7
cmake/systemd.cmake
cmake/systemd.cmake
+2
-2
No files found.
CMakeLists.txt
View file @
58a6b9eb
...
...
@@ -130,6 +130,7 @@ IF (NOT CPACK_GENERATOR)
ENDIF
(
WIN32
)
ENDIF
(
NOT CPACK_GENERATOR
)
INCLUDE
(
misc
)
INCLUDE
(
mysql_version
)
INCLUDE
(
cpack_source_ignore_files
)
INCLUDE
(
install_layout
)
...
...
cmake/misc.cmake
0 → 100644
View file @
58a6b9eb
FUNCTION
(
MESSAGE_ONCE id out
)
IF
(
NOT __msg1_
${
id
}
STREQUAL
"
${
out
}
"
)
MESSAGE
(
STATUS
"
${
out
}
"
)
ENDIF
()
SET
(
__msg1_
${
id
}
"
${
out
}
"
CACHE INTERNAL
""
)
ENDFUNCTION
()
cmake/ssl.cmake
View file @
58a6b9eb
...
...
@@ -69,6 +69,7 @@ MACRO (MYSQL_USE_BUNDLED_SSL)
SET
(
SSL_SOURCES
${
SSL_SOURCES
}
${
CMAKE_SOURCE_DIR
}
/extra/yassl/taocrypt/
${
file
}
)
ENDFOREACH
()
MESSAGE_ONCE
(
SSL_LIBRARIES
"SSL_LIBRARIES =
${
SSL_LIBRARIES
}
"
)
ENDMACRO
()
# MYSQL_CHECK_SSL
...
...
@@ -139,7 +140,7 @@ MACRO (MYSQL_CHECK_SSL)
NAMES openssl/applink.c
HINTS
${
OPENSSL_ROOT_DIR
}
/include
)
MESSAGE
(
STATUS
"OPENSSL_APPLINK_C
${
OPENSSL_APPLINK_C
}
"
)
MESSAGE
_ONCE
(
OPENSSL_APPLINK_C
"OPENSSL_APPLINK_C
${
OPENSSL_APPLINK_C
}
"
)
ENDIF
()
# On mac this list is <.dylib;.so;.a>
...
...
@@ -186,12 +187,11 @@ MACRO (MYSQL_CHECK_SSL)
"^.*OPENSSL_VERSION_NUMBER[
\t
]+0x([0-9]).*$"
"
\\
1"
OPENSSL_MAJOR_VERSION
"
${
OPENSSL_VERSION_NUMBER
}
"
)
MESSAGE
(
STATUS
"OPENSSL_INCLUDE_DIR =
${
OPENSSL_INCLUDE_DIR
}
"
)
MESSAGE
(
STATUS
"OPENSSL_LIBRARIES =
${
OPENSSL_LIBRARIES
}
"
)
MESSAGE
(
STATUS
"CRYPTO_LIBRARY =
${
CRYPTO_LIBRARY
}
"
)
MESSAGE
(
STATUS
"OPENSSL_MAJOR_VERSION =
${
OPENSSL_MAJOR_VERSION
}
"
)
MESSAGE
(
STATUS
"SSL_LIBRARIES =
${
SSL_LIBRARIES
}
"
)
MESSAGE_ONCE
(
OPENSSL_INCLUDE_DIR
"OPENSSL_INCLUDE_DIR =
${
OPENSSL_INCLUDE_DIR
}
"
)
MESSAGE_ONCE
(
OPENSSL_LIBRARIES
"OPENSSL_LIBRARIES =
${
OPENSSL_LIBRARIES
}
"
)
MESSAGE_ONCE
(
CRYPTO_LIBRARY
"CRYPTO_LIBRARY =
${
CRYPTO_LIBRARY
}
"
)
MESSAGE_ONCE
(
OPENSSL_MAJOR_VERSION
"OPENSSL_MAJOR_VERSION =
${
OPENSSL_MAJOR_VERSION
}
"
)
MESSAGE_ONCE
(
SSL_LIBRARIES
"SSL_LIBRARIES =
${
SSL_LIBRARIES
}
"
)
SET
(
SSL_INCLUDE_DIRS
${
OPENSSL_INCLUDE_DIR
}
)
SET
(
SSL_INTERNAL_INCLUDE_DIRS
""
)
SET
(
SSL_DEFINES
"-DHAVE_OPENSSL"
)
...
...
cmake/systemd.cmake
View file @
58a6b9eb
...
...
@@ -65,7 +65,7 @@ MACRO(CHECK_SYSTEMD)
SET
(
SYSTEMD_EXECSTARTPRE
"ExecStartPre=/usr/bin/install -m 755 -o mysql -g root -d /var/run/mysqld"
)
SET
(
SYSTEMD_EXECSTARTPOST
"ExecStartPost=/etc/mysql/debian-start"
)
ENDIF
()
MESSAGE
(
STATUS
"Systemd features enabled"
)
MESSAGE
_ONCE
(
systemd
"Systemd features enabled"
)
ELSE
()
UNSET
(
LIBSYSTEMD
)
UNSET
(
HAVE_SYSTEMD
)
...
...
@@ -73,7 +73,7 @@ MACRO(CHECK_SYSTEMD)
UNSET
(
HAVE_SYSTEMD_SD_LISTEN_FDS
)
UNSET
(
HAVE_SYSTEMD_SD_NOTIFY
)
UNSET
(
HAVE_SYSTEMD_SD_NOTIFYF
)
MESSAGE
(
STATUS
"Systemd features not enabled"
)
MESSAGE
_ONCE
(
systemd
"Systemd features not enabled"
)
IF
(
WITH_SYSTEMD STREQUAL
"yes"
)
MESSAGE
(
FATAL_ERROR
"Requested WITH_SYSTEMD=YES however no dependencies installed/found"
)
ENDIF
()
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment