summaryrefslogtreecommitdiff
path: root/sql/CMakeLists.txt
diff options
context:
space:
mode:
authorSergei Golubchik <sergii@pisem.net>2012-05-22 11:04:32 +0200
committerSergei Golubchik <sergii@pisem.net>2012-05-22 11:04:32 +0200
commitec586f529c871ec39556ded59206bdb813387130 (patch)
treef6121386b8b032c912bfdc30af858b3f04678f75 /sql/CMakeLists.txt
parent329daad2d32730c1aade8134d1709383fe072309 (diff)
downloadmariadb-git-ec586f529c871ec39556ded59206bdb813387130.tar.gz
Building RPMs with CPack
configure with cmake -DRPM=distro
Diffstat (limited to 'sql/CMakeLists.txt')
-rw-r--r--sql/CMakeLists.txt6
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/CMakeLists.txt b/sql/CMakeLists.txt
index f57addbc117..ecf91fcf043 100644
--- a/sql/CMakeLists.txt
+++ b/sql/CMakeLists.txt
@@ -216,7 +216,7 @@ ADD_CUSTOM_COMMAND(
DEPENDS gen_lex_hash
)
-MYSQL_ADD_EXECUTABLE(mysql_tzinfo_to_sql tztime.cc)
+MYSQL_ADD_EXECUTABLE(mysql_tzinfo_to_sql tztime.cc COMPONENT Server)
SET_TARGET_PROPERTIES(mysql_tzinfo_to_sql PROPERTIES COMPILE_FLAGS "-DTZINFO2SQL")
TARGET_LINK_LIBRARIES(mysql_tzinfo_to_sql mysys)
@@ -311,8 +311,8 @@ IF(WIN32 AND MYSQLD_EXECUTABLE)
ELSE()
# Not windows or cross compiling, just install an empty directory
INSTALL(FILES ${DUMMY_FILE} DESTINATION data/mysql COMPONENT DataFiles)
-ENDIF()
-ENDIF()
+ENDIF(WIN32 AND MYSQLD_EXECUTABLE)
+ENDIF(INSTALL_LAYOUT STREQUAL "STANDALONE")
IF(WIN32)
SET(my_bootstrap_sql ${CMAKE_CURRENT_BINARY_DIR}/my_bootstrap.sql)