summaryrefslogtreecommitdiff
path: root/include/CMakeLists.txt
diff options
context:
space:
mode:
authorunknown <knielsen@knielsen-hq.org>2012-04-03 08:00:57 +0200
committerunknown <knielsen@knielsen-hq.org>2012-04-03 08:00:57 +0200
commit34ed8f33795b639d21817003236ce0f6c069481d (patch)
tree167bbcd45df855ce93c8ded19dee4df1fdb2a915 /include/CMakeLists.txt
parentb00ee6e8e5629f3ae34ad25151253ee3854dc7ca (diff)
downloadmariadb-git-34ed8f33795b639d21817003236ce0f6c069481d.tar.gz
lp:886550 Wrong installation path for some include files.
Now install all includes in a flat hierarchy under $PREFIX/include/mysq/, same as 5.3. User can override with -DINSTALL_INCLUDEDIR
Diffstat (limited to 'include/CMakeLists.txt')
-rw-r--r--include/CMakeLists.txt14
1 files changed, 3 insertions, 11 deletions
diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt
index 052df5d3276..3046c3f7614 100644
--- a/include/CMakeLists.txt
+++ b/include/CMakeLists.txt
@@ -20,22 +20,14 @@ ${CMAKE_CURRENT_BINARY_DIR}/mysqld_ername.h
${CMAKE_CURRENT_BINARY_DIR}/mysqld_error.h
${CMAKE_CURRENT_BINARY_DIR}/sql_state.h
)
-SET(HEADERS_ABI
+
+SET(HEADERS
mysql.h
mysql_com.h
mysql_time.h
my_list.h
my_alloc.h
typelib.h
- mysql/plugin.h
- mysql/plugin_audit.h
- mysql/plugin_ftparser.h
- mysql/plugin_auth.h
- mysql/client_plugin.h
-)
-
-SET(HEADERS
- ${HEADERS_ABI}
my_dbug.h
m_string.h
my_sys.h
@@ -61,4 +53,4 @@ SET(HEADERS
)
INSTALL(FILES ${HEADERS} DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development)
-INSTALL(DIRECTORY mysql/ DESTINATION ${INSTALL_INCLUDEDIR}/mysql COMPONENT Development FILES_MATCHING PATTERN "*.h")
+INSTALL(DIRECTORY mysql/ DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development FILES_MATCHING PATTERN "*.h")