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
20b785c0
Commit
20b785c0
authored
Nov 14, 2009
by
Vladislav Vaintroub
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix make install/ mysqld_safe
parent
d71dfe21
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
3 deletions
+8
-3
CMakeLists.txt
CMakeLists.txt
+1
-1
scripts/CMakeLists.txt
scripts/CMakeLists.txt
+7
-2
No files found.
CMakeLists.txt
View file @
20b785c0
...
@@ -134,7 +134,7 @@ IF(WIN32)
...
@@ -134,7 +134,7 @@ IF(WIN32)
SET
(
DEFAULT_MYSQL_HOME
"C:/Program Files/MySQL/MySQL Server
${
MYSQL_BASE_VERSION
}
/"
)
SET
(
DEFAULT_MYSQL_HOME
"C:/Program Files/MySQL/MySQL Server
${
MYSQL_BASE_VERSION
}
/"
)
SET
(
SHAREDIR share
)
SET
(
SHAREDIR share
)
ELSE
()
ELSE
()
SET
(
DEFAULT_MYSQL_HOME
${
CMAKE_INSTALL_PREFIX
}
/mysql/
)
SET
(
DEFAULT_MYSQL_HOME
${
CMAKE_INSTALL_PREFIX
}
)
SET
(
SHAREDIR
${
DEFAULT_MYSQL_HOME
}
share
)
SET
(
SHAREDIR
${
DEFAULT_MYSQL_HOME
}
share
)
ENDIF
()
ENDIF
()
...
...
scripts/CMakeLists.txt
View file @
20b785c0
...
@@ -55,7 +55,12 @@ ENDIF()
...
@@ -55,7 +55,12 @@ ENDIF()
ENDIF
(
UNIX
)
ENDIF
(
UNIX
)
# some scripts use @TARGET_LINUX@
IF
(
CMAKE_SYSTEM_NAME MATCHES
"Linux"
)
SET
(
TARGET_LINUX 1
)
ELSE
()
SET
(
TARGET_LINUX 0
)
ENDIF
()
# Build comp_sql - used for embedding SQL in C or C++ programs
# Build comp_sql - used for embedding SQL in C or C++ programs
IF
(
NOT CMAKE_CROSSCOMPILING
)
IF
(
NOT CMAKE_CROSSCOMPILING
)
ADD_EXECUTABLE
(
comp_sql comp_sql.c
)
ADD_EXECUTABLE
(
comp_sql comp_sql.c
)
...
@@ -107,7 +112,7 @@ SET(LDFLAGS "${CMAKE_SHARED_LIBRARY_LINK_FLAGS}")
...
@@ -107,7 +112,7 @@ SET(LDFLAGS "${CMAKE_SHARED_LIBRARY_LINK_FLAGS}")
IF
(
WIN32
)
IF
(
WIN32
)
SET
(
prefix
"
${
CMAKE_INSTALL_PREFIX
}
/MySQL Server
${
MYSQL_BASE_VERSION
}
"
)
SET
(
prefix
"
${
CMAKE_INSTALL_PREFIX
}
/MySQL Server
${
MYSQL_BASE_VERSION
}
"
)
ELSE
()
ELSE
()
set
(
prefix
"
${
CMAKE_INSTALL_PREFIX
}
/mysql
"
)
set
(
prefix
"
${
CMAKE_INSTALL_PREFIX
}
"
)
ENDIF
()
ENDIF
()
SET
(
sysconfdir
${
prefix
}
)
SET
(
sysconfdir
${
prefix
}
)
...
...
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