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
55b47649
Commit
55b47649
authored
Aug 15, 2014
by
James Le Cuirot
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MDEV-6579: Properly handle gen_pfs_lex_token when cross-compiling
parent
fd4a4b8f
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
4 deletions
+6
-4
CMakeLists.txt
CMakeLists.txt
+1
-1
storage/perfschema/CMakeLists.txt
storage/perfschema/CMakeLists.txt
+5
-3
No files found.
CMakeLists.txt
View file @
55b47649
...
@@ -468,7 +468,7 @@ ADD_SUBDIRECTORY(packaging/solaris)
...
@@ -468,7 +468,7 @@ ADD_SUBDIRECTORY(packaging/solaris)
IF
(
NOT CMAKE_CROSSCOMPILING
)
IF
(
NOT CMAKE_CROSSCOMPILING
)
SET
(
EXPORTED comp_err comp_sql factorial
)
SET
(
EXPORTED comp_err comp_sql factorial
)
IF
(
NOT WITHOUT_SERVER
)
IF
(
NOT WITHOUT_SERVER
)
SET
(
EXPORTED
${
EXPORTED
}
gen_lex_hash
)
SET
(
EXPORTED
${
EXPORTED
}
gen_lex_hash
gen_pfs_lex_token
)
ENDIF
()
ENDIF
()
# minimal target to build only binaries for export
# minimal target to build only binaries for export
ADD_CUSTOM_TARGET
(
import_executables DEPENDS
${
EXPORTED
}
)
ADD_CUSTOM_TARGET
(
import_executables DEPENDS
${
EXPORTED
}
)
...
...
storage/perfschema/CMakeLists.txt
View file @
55b47649
...
@@ -22,9 +22,11 @@ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}
...
@@ -22,9 +22,11 @@ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}
ADD_DEFINITIONS
(
-DMYSQL_SERVER
)
ADD_DEFINITIONS
(
-DMYSQL_SERVER
)
# Gen_pfs_lex_token
# Gen_pfs_lex_token
ADD_EXECUTABLE
(
gen_pfs_lex_token gen_pfs_lex_token.cc
)
IF
(
NOT CMAKE_CROSSCOMPILING
)
# gen_pfs_lex_token itself depends on ${CMAKE_CURRENT_BINARY_DIR}/sql/sql_yacc.h
ADD_EXECUTABLE
(
gen_pfs_lex_token gen_pfs_lex_token.cc
)
ADD_DEPENDENCIES
(
gen_pfs_lex_token GenServerSource
)
# gen_pfs_lex_token itself depends on ${CMAKE_CURRENT_BINARY_DIR}/sql/sql_yacc.h
ADD_DEPENDENCIES
(
gen_pfs_lex_token GenServerSource
)
ENDIF
()
ADD_CUSTOM_COMMAND
(
ADD_CUSTOM_COMMAND
(
OUTPUT
${
CMAKE_CURRENT_BINARY_DIR
}
/pfs_lex_token.h
OUTPUT
${
CMAKE_CURRENT_BINARY_DIR
}
/pfs_lex_token.h
...
...
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