diff options
| author | Vladislav Vaintroub <wlad@montyprogram.com> | 2011-01-29 18:51:12 +0100 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@montyprogram.com> | 2011-01-29 18:51:12 +0100 |
| commit | b19e99865ccf3e946ebe59bf09add8e0452904ac (patch) | |
| tree | 23cb9e8176ef9d0e276b47d197e11d195b2ecafb /libmysql | |
| parent | 3edf4dcd5a36be8d5acc94e0c5e29e77e47cd15b (diff) | |
| download | mariadb-git-b19e99865ccf3e946ebe59bf09add8e0452904ac.tar.gz | |
MWL#55 : cherrypick MySQL 5.5 CMake/build improvements in order
to be able to build MSI based installer
Diffstat (limited to 'libmysql')
| -rwxr-xr-x | libmysql/CMakeLists.txt | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/libmysql/CMakeLists.txt b/libmysql/CMakeLists.txt index fad34ac89a3..2c9434b3a15 100755 --- a/libmysql/CMakeLists.txt +++ b/libmysql/CMakeLists.txt @@ -124,14 +124,8 @@ ADD_DEPENDENCIES(libmysql GenError) TARGET_LINK_LIBRARIES(libmysql wsock32) ADD_DEFINITIONS(-DHAVE_DLOPEN) -IF(EMBED_MANIFESTS) - MYSQL_EMBED_MANIFEST("myTest" "asInvoker") -ENDIF(EMBED_MANIFESTS) -# TODO: Install mysqlclient_notls? -# TODO: Which component should these be part of, development? -INSTALL(TARGETS mysqlclient DESTINATION lib/opt COMPONENT runtime) -INSTALL(TARGETS libmysql DESTINATION lib/opt COMPONENT runtime) - -# Also install libmysql.dll to the bin dir -INSTALL(TARGETS libmysql DESTINATION bin COMPONENT runtime) +INSTALL(TARGETS mysqlclient DESTINATION lib COMPONENT Development) +INSTALL_DEBUG_SYMBOLS(mysqlclient DESTINATION lib) +INSTALL(TARGETS libmysql DESTINATION lib COMPONENT SharedLibraries) +INSTALL_DEBUG_SYMBOLS(libmysql DESTINATION lib) |