diff options
| author | unknown <joerg@trift2.> | 2007-08-03 11:06:53 +0200 |
|---|---|---|
| committer | unknown <joerg@trift2.> | 2007-08-03 11:06:53 +0200 |
| commit | c28ca5e2e2c2917536fd2e0b857d67aad114004d (patch) | |
| tree | 0038131c737dc671b86afd884e2125e22ce028ab /sql/CMakeLists.txt | |
| parent | 126a403278d893ba80d99b539bb9ca28f3eb4ac2 (diff) | |
| download | mariadb-git-c28ca5e2e2c2917536fd2e0b857d67aad114004d.tar.gz | |
Re-apply fixes originally made by Kent,
they got lost because of a merge conflict with the CMakeLists.txt
dependency fix (numer 29982 in our bugs DB).
These changes are for bug#30118.
client/CMakeLists.txt:
Manual merge from 5.0 (bug#30118)
libmysql/CMakeLists.txt:
Manual merge from 5.0 (bug#30118)
mysys/CMakeLists.txt:
Manual merge from 5.0 (bug#30118)
sql/CMakeLists.txt:
Added missing '${MYSQLD_EXE_SUFFIX}' to "mysqld" targets new in 5.1
zlib/CMakeLists.txt:
Manual merge from 5.0 (bug#30118)
Diffstat (limited to 'sql/CMakeLists.txt')
| -rwxr-xr-x | sql/CMakeLists.txt | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sql/CMakeLists.txt b/sql/CMakeLists.txt index c792e10c3af..7e0d28070ad 100755 --- a/sql/CMakeLists.txt +++ b/sql/CMakeLists.txt @@ -91,19 +91,19 @@ IF(EMBED_MANIFESTS) MYSQL_EMBED_MANIFEST("mysqld" "asInvoker") ENDIF(EMBED_MANIFESTS) IF(WITH_ARCHIVE_STORAGE_ENGINE) - TARGET_LINK_LIBRARIES(mysqld archive) + TARGET_LINK_LIBRARIES(mysqld${MYSQLD_EXE_SUFFIX} archive) ENDIF(WITH_ARCHIVE_STORAGE_ENGINE) IF(WITH_BLACKHOLE_STORAGE_ENGINE) - TARGET_LINK_LIBRARIES(mysqld blackhole) + TARGET_LINK_LIBRARIES(mysqld${MYSQLD_EXE_SUFFIX} blackhole) ENDIF(WITH_BLACKHOLE_STORAGE_ENGINE) IF(WITH_CSV_STORAGE_ENGINE) - TARGET_LINK_LIBRARIES(mysqld csv) + TARGET_LINK_LIBRARIES(mysqld${MYSQLD_EXE_SUFFIX} csv) ENDIF(WITH_CSV_STORAGE_ENGINE) IF(WITH_EXAMPLE_STORAGE_ENGINE) TARGET_LINK_LIBRARIES(mysqld${MYSQLD_EXE_SUFFIX} example) ENDIF(WITH_EXAMPLE_STORAGE_ENGINE) IF(WITH_FEDERATED_STORAGE_ENGINE) - TARGET_LINK_LIBRARIES(mysqld federated) + TARGET_LINK_LIBRARIES(mysqld${MYSQLD_EXE_SUFFIX} federated) ENDIF(WITH_FEDERATED_STORAGE_ENGINE) IF(WITH_INNOBASE_STORAGE_ENGINE) TARGET_LINK_LIBRARIES(mysqld${MYSQLD_EXE_SUFFIX} innobase) |