database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Bug#24732 Executables do not include Vista manifests

Browse Source 
- Post merge cleanup.


CMakeLists.txt:
  Bug#24732 Executables do not include Vista manifests
  - Added logic for EMBED_MANIFESTS configuration option.
client/CMakeLists.txt:
  Bug#24732 Executables do not include Vista manifests
  - Embed manifest with custom CMake MACRO for client executables.
extra/CMakeLists.txt:
  Bug#24732 Executables do not include Vista manifests
  - Embed manifest with custom CMake MACRO for my_print_default executable.
libmysql/CMakeLists.txt:
  Bug#24732 Executables do not include Vista manifests
  - Embed manifest with custom CMake MACRO for myTest executable.
server-tools/instance-manager/CMakeLists.txt:
  Bug#24732 Executables do not include Vista manifests
  - Embed manifest with custom CMake MACRO for mysqlmanager executable.
sql/CMakeLists.txt:
  Bug#24732 Executables do not include Vista manifests
  - Embed manifest with custom CMake MACRO for mysqld executable.
storage/myisam/CMakeLists.txt:
  Bug#24732 Executables do not include Vista manifests
  - Embed manifest with custom CMake MACRO for myisam executables.
win/README:
  Bug#24732 Executables do not include Vista manifests
  - Added new configuration option documentation.
win/configure.js:
  Bug#24732 Executables do not include Vista manifests
  - Added new EMBED_MANIFESTS configuration option.
This commit is contained in:
unknown
2007-04-23 16:23:32 -04:00
parent 917f89ceb6
commit 7ad5d7c1ef
9 changed files with 73 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libmysql/CMakeLists.txt
View File

@ -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)