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
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
13b54aa9
Commit
13b54aa9
authored
17 years ago
by
iggy@recycle.(none)
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Bug#24732 Executables do not include Vista manifests
- Post merge cleanup.
parent
658d2127
No related merge requests found
Changes
9
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
73 additions
and
1 deletion
+73
-1
CMakeLists.txt
CMakeLists.txt
+27
-0
client/CMakeLists.txt
client/CMakeLists.txt
+13
-0
extra/CMakeLists.txt
extra/CMakeLists.txt
+5
-0
libmysql/CMakeLists.txt
libmysql/CMakeLists.txt
+6
-0
server-tools/instance-manager/CMakeLists.txt
server-tools/instance-manager/CMakeLists.txt
+5
-0
sql/CMakeLists.txt
sql/CMakeLists.txt
+5
-0
storage/myisam/CMakeLists.txt
storage/myisam/CMakeLists.txt
+8
-0
win/README
win/README
+3
-1
win/configure.js
win/configure.js
+1
-0
No files found.
CMakeLists.txt
View file @
13b54aa9
...
...
@@ -134,6 +134,33 @@ ENDIF(CMAKE_GENERATOR MATCHES "Visual Studio 7" OR
ADD_DEFINITIONS
(
"-D_WINDOWS -D__WIN__ -D _CRT_SECURE_NO_DEPRECATE"
)
IF
(
EMBED_MANIFESTS
)
# Search for the Manifest tool. CMake will first search it's defaults
# (CMAKE_FRAMEWORK_PATH, CMAKE_APPBUNDLE_PATH, CMAKE_PROGRAM_PATH and
# the system PATH) followed by the listed paths which are the current
# possible defaults and should be updated when necessary. The custom
# manifests are designed to be compatible with all mt versions.
FIND_PROGRAM
(
HAVE_MANIFEST_TOOL NAMES mt
PATHS
"$ENV{PROGRAMFILES}/Microsoft Visual Studio 8/VC/bin"
"$ENV{PROGRAMFILES}/Microsoft Visual Studio 8/Common7/Tools/Bin"
"$ENV{PROGRAMFILES}/Microsoft Visual Studio 8/SDK/v2.0/Bin"
)
IF
(
HAVE_MANIFEST_TOOL
)
MESSAGE
(
STATUS
"Found Mainfest Tool. Embedding custom manifests."
)
ELSE
(
HAVE_MANIFEST_TOOL
)
MESSAGE
(
FATAL_ERROR
"Manifest tool, mt.exe, can't be found."
)
ENDIF
(
HAVE_MANIFEST_TOOL
)
# Disable automatic manifest generation.
STRING
(
REPLACE
"/MANIFEST"
"/MANIFEST:NO"
CMAKE_EXE_LINKER_FLAGS
${
CMAKE_EXE_LINKER_FLAGS
}
)
# Set the processor architecture.
IF
(
CMAKE_GENERATOR MATCHES
"Visual Studio 8 2005 Win64"
)
SET
(
PROCESSOR_ARCH
"X64"
)
ELSE
(
CMAKE_GENERATOR MATCHES
"Visual Studio 8 2005 Win64"
)
SET
(
PROCESSOR_ARCH
"X86"
)
ENDIF
(
CMAKE_GENERATOR MATCHES
"Visual Studio 8 2005 Win64"
)
ENDIF
(
EMBED_MANIFESTS
)
ADD_SUBDIRECTORY
(
vio
)
ADD_SUBDIRECTORY
(
dbug
)
ADD_SUBDIRECTORY
(
strings
)
...
...
This diff is collapsed.
Click to expand it.
client/CMakeLists.txt
View file @
13b54aa9
...
...
@@ -12,6 +12,7 @@
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
INCLUDE
(
"
${
PROJECT_SOURCE_DIR
}
/win/mysql_manifest.cmake"
)
SET
(
CMAKE_CXX_FLAGS_DEBUG
"
${
CMAKE_CXX_FLAGS_DEBUG
}
-DSAFEMALLOC -DSAFE_MUTEX"
)
SET
(
CMAKE_C_FLAGS_DEBUG
"
${
CMAKE_C_FLAGS_DEBUG
}
-DSAFEMALLOC -DSAFE_MUTEX"
)
...
...
@@ -101,3 +102,15 @@ TARGET_LINK_LIBRARIES(mysqlslap mysqlclient mysys yassl taocrypt zlib wsock32 db
ADD_EXECUTABLE
(
echo echo.c
)
IF
(
EMBED_MANIFESTS
)
MYSQL_EMBED_MANIFEST
(
"mysql"
"asInvoker"
)
MYSQL_EMBED_MANIFEST
(
"mysqltest"
"asInvoker"
)
MYSQL_EMBED_MANIFEST
(
"mysqlcheck"
"asInvoker"
)
MYSQL_EMBED_MANIFEST
(
"mysqldump"
"asInvoker"
)
MYSQL_EMBED_MANIFEST
(
"mysqlimport"
"asInvoker"
)
MYSQL_EMBED_MANIFEST
(
"mysql_upgrade"
"asInvoker"
)
MYSQL_EMBED_MANIFEST
(
"mysqlshow"
"asInvoker"
)
MYSQL_EMBED_MANIFEST
(
"mysqlbinlog"
"asInvoker"
)
MYSQL_EMBED_MANIFEST
(
"mysqladmin"
"asInvoker"
)
MYSQL_EMBED_MANIFEST
(
"echo"
"asInvoker"
)
ENDIF
(
EMBED_MANIFESTS
)
This diff is collapsed.
Click to expand it.
extra/CMakeLists.txt
View file @
13b54aa9
...
...
@@ -12,6 +12,7 @@
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
INCLUDE
(
"
${
PROJECT_SOURCE_DIR
}
/win/mysql_manifest.cmake"
)
SET
(
CMAKE_CXX_FLAGS_DEBUG
"
${
CMAKE_CXX_FLAGS_DEBUG
}
-DSAFEMALLOC -DSAFE_MUTEX"
)
SET
(
CMAKE_C_FLAGS_DEBUG
"
${
CMAKE_C_FLAGS_DEBUG
}
-DSAFEMALLOC -DSAFE_MUTEX"
)
...
...
@@ -45,3 +46,7 @@ TARGET_LINK_LIBRARIES(perror strings mysys dbug wsock32)
ADD_EXECUTABLE
(
replace replace.c
)
TARGET_LINK_LIBRARIES
(
replace strings mysys dbug wsock32
)
IF
(
EMBED_MANIFESTS
)
MYSQL_EMBED_MANIFEST
(
"myTest"
"asInvoker"
)
ENDIF
(
EMBED_MANIFESTS
)
This diff is collapsed.
Click to expand it.
libmysql/CMakeLists.txt
View file @
13b54aa9
...
...
@@ -15,6 +15,8 @@
# Need to set USE_TLS, since __declspec(thread) approach to thread local
# storage does not work properly in DLLs.
INCLUDE
(
"
${
PROJECT_SOURCE_DIR
}
/win/mysql_manifest.cmake"
)
SET
(
CMAKE_CXX_FLAGS_DEBUG
"
${
CMAKE_CXX_FLAGS_DEBUG
}
-DSAFEMALLOC -DSAFE_MUTEX -DUSE_TLS"
)
SET
(
CMAKE_C_FLAGS_DEBUG
"
${
CMAKE_C_FLAGS_DEBUG
}
-DSAFEMALLOC -DSAFE_MUTEX -DUSE_TLS"
)
...
...
@@ -67,3 +69,7 @@ TARGET_LINK_LIBRARIES(libmysql mysys strings wsock32)
ADD_EXECUTABLE
(
myTest mytest.c
)
TARGET_LINK_LIBRARIES
(
myTest libmysql
)
IF
(
EMBED_MANIFESTS
)
MYSQL_EMBED_MANIFEST
(
"myTest"
"asInvoker"
)
ENDIF
(
EMBED_MANIFESTS
)
This diff is collapsed.
Click to expand it.
server-tools/instance-manager/CMakeLists.txt
View file @
13b54aa9
...
...
@@ -12,6 +12,7 @@
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
INCLUDE
(
"
${
PROJECT_SOURCE_DIR
}
/win/mysql_manifest.cmake"
)
SET
(
CMAKE_CXX_FLAGS_DEBUG
"
${
CMAKE_CXX_FLAGS_DEBUG
}
-DSAFEMALLOC -DSAFE_MUTEX"
)
SET
(
CMAKE_C_FLAGS_DEBUG
"
${
CMAKE_C_FLAGS_DEBUG
}
-DSAFEMALLOC -DSAFE_MUTEX"
)
...
...
@@ -31,3 +32,7 @@ ADD_EXECUTABLE(mysqlmanager buffer.cc command.cc commands.cc guardian.cc instanc
ADD_DEPENDENCIES
(
mysqlmanager GenError
)
TARGET_LINK_LIBRARIES
(
mysqlmanager dbug mysys strings taocrypt vio yassl zlib wsock32
)
IF
(
EMBED_MANIFESTS
)
MYSQL_EMBED_MANIFEST
(
"mysqlmanager"
"asInvoker"
)
ENDIF
(
EMBED_MANIFESTS
)
This diff is collapsed.
Click to expand it.
sql/CMakeLists.txt
View file @
13b54aa9
...
...
@@ -12,6 +12,7 @@
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
INCLUDE
(
"
${
PROJECT_SOURCE_DIR
}
/win/mysql_manifest.cmake"
)
SET
(
CMAKE_CXX_FLAGS_DEBUG
"
${
CMAKE_CXX_FLAGS_DEBUG
}
-DSAFEMALLOC -DSAFE_MUTEX -DUSE_SYMDIR"
)
...
...
@@ -82,6 +83,10 @@ ADD_EXECUTABLE(mysqld ../sql-common/client.c derror.cc des_key_file.cc
${
PROJECT_SOURCE_DIR
}
/sql/lex_hash.h
)
TARGET_LINK_LIBRARIES
(
mysqld heap myisam myisammrg mysys yassl zlib dbug yassl
taocrypt strings vio regex wsock32 ws2_32
)
IF
(
EMBED_MANIFESTS
)
MYSQL_EMBED_MANIFEST
(
"mysqld"
"requireAdministrator"
)
ENDIF
(
EMBED_MANIFESTS
)
IF
(
WITH_ARCHIVE_STORAGE_ENGINE
)
TARGET_LINK_LIBRARIES
(
mysqld archive
)
ENDIF
(
WITH_ARCHIVE_STORAGE_ENGINE
)
...
...
This diff is collapsed.
Click to expand it.
storage/myisam/CMakeLists.txt
View file @
13b54aa9
...
...
@@ -12,6 +12,7 @@
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
INCLUDE
(
"
${
PROJECT_SOURCE_DIR
}
/win/mysql_manifest.cmake"
)
SET
(
CMAKE_CXX_FLAGS_DEBUG
"
${
CMAKE_CXX_FLAGS_DEBUG
}
-DSAFEMALLOC -DSAFE_MUTEX"
)
SET
(
CMAKE_C_FLAGS_DEBUG
"
${
CMAKE_C_FLAGS_DEBUG
}
-DSAFEMALLOC -DSAFE_MUTEX"
)
...
...
@@ -43,3 +44,10 @@ TARGET_LINK_LIBRARIES(myisamlog myisam mysys dbug strings zlib wsock32)
ADD_EXECUTABLE
(
myisampack myisampack.c
)
TARGET_LINK_LIBRARIES
(
myisampack myisam mysys dbug strings zlib wsock32
)
IF
(
EMBED_MANIFESTS
)
MYSQL_EMBED_MANIFEST
(
"myisam_ftdump"
"asInvoker"
)
MYSQL_EMBED_MANIFEST
(
"myisamchk"
"asInvoker"
)
MYSQL_EMBED_MANIFEST
(
"myisamlog"
"asInvoker"
)
MYSQL_EMBED_MANIFEST
(
"myisampack"
"asInvoker"
)
ENDIF
(
EMBED_MANIFESTS
)
This diff is collapsed.
Click to expand it.
win/README
View file @
13b54aa9
...
...
@@ -58,7 +58,9 @@ The options right now are
MYSQL_SERVER_SUFFIX=<suffix> Server suffix, default none
COMPILATION_COMMENT=<comment> Server comment, default "Source distribution"
MYSQL_TCP_PORT=<port> Server port, default 3306
CYBOZU Default character set is UTF8
CYBOZU Default character set is UTF8
EMBED_MANIFESTS Embed custom manifests into final exes, otherwise VS
default will be used.
So the command line could look like:
...
...
This diff is collapsed.
Click to expand it.
win/configure.js
View file @
13b54aa9
...
...
@@ -46,6 +46,7 @@ try
case
"
WITH_PARTITION_STORAGE_ENGINE
"
:
case
"
__NT__
"
:
case
"
CYBOZU
"
:
case
"
EMBED_MANIFESTS
"
:
configfile
.
WriteLine
(
"
SET (
"
+
args
.
Item
(
i
)
+
"
TRUE)
"
);
break
;
case
"
MYSQL_SERVER_SUFFIX
"
:
...
...
This diff is collapsed.
Click to expand it.
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