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
f70b11c8
Commit
f70b11c8
authored
May 21, 2021
by
Sergei Golubchik
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
cmake: fewer Build-Depends in SRPM
don't require tar/gtar, git, getconf, groff/nroff, and ruby.
parent
d7321893
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
18 additions
and
7 deletions
+18
-7
CMakeLists.txt
CMakeLists.txt
+2
-0
cmake/build_configurations/mysql_release.cmake
cmake/build_configurations/mysql_release.cmake
+6
-0
cmake/cpu_info.cmake
cmake/cpu_info.cmake
+4
-0
dbug/CMakeLists.txt
dbug/CMakeLists.txt
+1
-1
storage/mroonga/vendor/groonga/CMakeLists.txt
storage/mroonga/vendor/groonga/CMakeLists.txt
+5
-6
No files found.
CMakeLists.txt
View file @
f70b11c8
...
@@ -122,11 +122,13 @@ FOREACH(_base
...
@@ -122,11 +122,13 @@ FOREACH(_base
ENDIF
()
ENDIF
()
ENDFOREACH
()
ENDFOREACH
()
IF
(
NOT RPM AND NOT DEB
)
FOREACH
(
tool gtar tar git
)
FOREACH
(
tool gtar tar git
)
STRING
(
TOUPPER
${
tool
}
TOOL
)
STRING
(
TOUPPER
${
tool
}
TOOL
)
FIND_PROGRAM
(
${
TOOL
}
_EXECUTABLE
${
tool
}
DOC
"path to the executable"
)
FIND_PROGRAM
(
${
TOOL
}
_EXECUTABLE
${
tool
}
DOC
"path to the executable"
)
MARK_AS_ADVANCED
(
${
TOOL
}
_EXECUTABLE
)
MARK_AS_ADVANCED
(
${
TOOL
}
_EXECUTABLE
)
ENDFOREACH
()
ENDFOREACH
()
ENDIF
()
# Following autotools tradition, add preprocessor definitions
# Following autotools tradition, add preprocessor definitions
# specified in environment variable CPPFLAGS
# specified in environment variable CPPFLAGS
...
...
cmake/build_configurations/mysql_release.cmake
View file @
f70b11c8
...
@@ -88,6 +88,12 @@ ENDIF()
...
@@ -88,6 +88,12 @@ ENDIF()
SET
(
WITH_INNODB_SNAPPY OFF CACHE STRING
""
)
SET
(
WITH_INNODB_SNAPPY OFF CACHE STRING
""
)
SET
(
WITH_NUMA 0 CACHE BOOL
""
)
SET
(
WITH_NUMA 0 CACHE BOOL
""
)
SET
(
CPU_LEVEL1_DCACHE_LINESIZE 0
)
IF
(
NOT EXISTS
${
CMAKE_SOURCE_DIR
}
/.git
)
SET
(
GIT_EXECUTABLE GIT_EXECUTABLE-NOTFOUND CACHE FILEPATH
""
)
ENDIF
()
IF
(
WIN32
)
IF
(
WIN32
)
SET
(
INSTALL_MYSQLTESTDIR
""
CACHE STRING
""
)
SET
(
INSTALL_MYSQLTESTDIR
""
CACHE STRING
""
)
SET
(
INSTALL_SQLBENCHDIR
""
CACHE STRING
""
)
SET
(
INSTALL_SQLBENCHDIR
""
CACHE STRING
""
)
...
...
cmake/cpu_info.cmake
View file @
f70b11c8
...
@@ -15,6 +15,8 @@
...
@@ -15,6 +15,8 @@
# Symbols with information about the CPU.
# Symbols with information about the CPU.
IF
(
NOT DEFINED CPU_LEVEL1_DCACHE_LINESIZE
)
IF
(
CMAKE_SYSTEM_NAME MATCHES
"Darwin"
)
IF
(
CMAKE_SYSTEM_NAME MATCHES
"Darwin"
)
FIND_PROGRAM
(
SYSCTL sysctl
)
FIND_PROGRAM
(
SYSCTL sysctl
)
MARK_AS_ADVANCED
(
SYSCTL
)
MARK_AS_ADVANCED
(
SYSCTL
)
...
@@ -37,3 +39,5 @@ ELSE()
...
@@ -37,3 +39,5 @@ ELSE()
)
)
ENDIF
()
ENDIF
()
ENDIF
()
ENDIF
()
ENDIF
()
dbug/CMakeLists.txt
View file @
f70b11c8
...
@@ -29,7 +29,7 @@ IF(NOT CMAKE_CROSSCOMPILING)
...
@@ -29,7 +29,7 @@ IF(NOT CMAKE_CROSSCOMPILING)
TARGET_LINK_LIBRARIES
(
factorial dbug
)
TARGET_LINK_LIBRARIES
(
factorial dbug
)
ENDIF
()
ENDIF
()
IF
(
NOT WIN32 AND NOT CMAKE_GENERATOR MATCHES Xcode
)
IF
(
NOT WIN32 AND NOT CMAKE_GENERATOR MATCHES Xcode
AND NOT RPM AND NOT DEB
)
FIND_PROGRAM
(
GROFF groff
)
FIND_PROGRAM
(
GROFF groff
)
FIND_PROGRAM
(
NROFF nroff
)
FIND_PROGRAM
(
NROFF nroff
)
MARK_AS_ADVANCED
(
GROFF
)
MARK_AS_ADVANCED
(
GROFF
)
...
...
storage/mroonga/vendor/groonga/CMakeLists.txt
View file @
f70b11c8
...
@@ -590,14 +590,13 @@ else()
...
@@ -590,14 +590,13 @@ else()
set
(
GRN_WITH_MESSAGE_PACK FALSE
)
set
(
GRN_WITH_MESSAGE_PACK FALSE
)
endif
()
endif
()
find_program
(
RUBY NAMES
"ruby2.3"
"ruby23"
"ruby2.2"
"ruby22"
"ruby2.1"
"ruby21"
"ruby"
)
option
(
GRN_WITH_MRUBY
"use mruby"
OFF
)
option
(
GRN_WITH_MRUBY
"use mruby"
OFF
)
if
(
GRN_WITH_MRUBY
)
if
(
GRN_WITH_MRUBY
)
find_program
(
RUBY NAMES
"ruby2.3"
"ruby23"
"ruby2.2"
"ruby22"
"ruby2.1"
"ruby21"
"ruby"
)
set
(
MRUBY_INCLUDE_DIRS
set
(
MRUBY_INCLUDE_DIRS
"
${
CMAKE_CURRENT_SOURCE_DIR
}
/vendor/mruby-source/include"
)
"
${
CMAKE_CURRENT_SOURCE_DIR
}
/vendor/mruby-source/include"
)
set
(
MRUBY_LIBS mruby
)
set
(
MRUBY_LIBS mruby
)
...
...
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