aboutsummaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
authorclick <none@none>2010-12-24 18:33:11 +0100
committerclick <none@none>2010-12-24 18:33:11 +0100
commite57866ac9acc8e2457c861495d72d0eb3e740afc (patch)
treea1cb08a0632e3291b07fdc7acf01511292dba253 /sql
parenta99e12cf0f426ab5a7d3f4f7cf6bbed8df113af3 (diff)
Buildsystem: Stop the retarded recursive hunting for CMakeLists.txt when copying SQL-files nad use the proper method for direct copying.
Closes issue 5240 --HG-- branch : trunk
Diffstat (limited to 'sql')
-rw-r--r--sql/CMakeLists.txt23
-rw-r--r--sql/create/CMakeLists.txt5
-rw-r--r--sql/scripts/CMakeLists.txt5
-rw-r--r--sql/updates/2.4.3_old/CMakeLists.txt3
-rw-r--r--sql/updates/3.0.9_old/CMakeLists.txt3
-rw-r--r--sql/updates/3.1.3_old/CMakeLists.txt3
-rw-r--r--sql/updates/3.2.2a_old/CMakeLists.txt3
-rw-r--r--sql/updates/3.3.2_old/CMakeLists.txt3
-rw-r--r--sql/updates/3.3.3a_old/CMakeLists.txt3
-rw-r--r--sql/updates/3.3.5a_old/CMakeLists.txt3
-rw-r--r--sql/updates/CMakeLists.txt11
11 files changed, 19 insertions, 46 deletions
diff --git a/sql/CMakeLists.txt b/sql/CMakeLists.txt
index fc4999414df..e1b0921ae05 100644
--- a/sql/CMakeLists.txt
+++ b/sql/CMakeLists.txt
@@ -1,6 +1,21 @@
+# Copyright (C) 2005-2010 Trinity <http://www.trinitycore.org/>
+#
+# This file is free software; as a special exception the author gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
if( WITH_SQL )
- add_subdirectory(updates)
- add_subdirectory(scripts)
- add_subdirectory(base)
- add_subdirectory(create)
+ install(
+ DIRECTORY
+ updates
+ scripts
+ base
+ create
+ DESTINATION
+ shared/trinity/sql
+ )
endif()
diff --git a/sql/create/CMakeLists.txt b/sql/create/CMakeLists.txt
deleted file mode 100644
index 91cb61ec84e..00000000000
--- a/sql/create/CMakeLists.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-########### install files ###############
-
-FILE(GLOB _SQL *.sql)
-
-install(FILES ${_SQL} DESTINATION share/trinity/sql/tools) \ No newline at end of file
diff --git a/sql/scripts/CMakeLists.txt b/sql/scripts/CMakeLists.txt
deleted file mode 100644
index 554ff9ba184..00000000000
--- a/sql/scripts/CMakeLists.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-########### install files ###############
-
-FILE(GLOB _SQL *.sql)
-
-install(FILES ${README} DESTINATION share/trinity/sql/full) \ No newline at end of file
diff --git a/sql/updates/2.4.3_old/CMakeLists.txt b/sql/updates/2.4.3_old/CMakeLists.txt
deleted file mode 100644
index 585813a934b..00000000000
--- a/sql/updates/2.4.3_old/CMakeLists.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-FILE(GLOB _SQL_243 *.sql)
-
-INSTALL(FILES ${_SQL_243} DESTINATION share/trinity/sql/updates/2.4.3_old) \ No newline at end of file
diff --git a/sql/updates/3.0.9_old/CMakeLists.txt b/sql/updates/3.0.9_old/CMakeLists.txt
deleted file mode 100644
index d09917d76f9..00000000000
--- a/sql/updates/3.0.9_old/CMakeLists.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-FILE(GLOB _SQL_309 *.sql)
-
-INSTALL(FILES ${_SQL_309} DESTINATION share/trinity/sql/updates/3.0.9_old) \ No newline at end of file
diff --git a/sql/updates/3.1.3_old/CMakeLists.txt b/sql/updates/3.1.3_old/CMakeLists.txt
deleted file mode 100644
index 5a99663dff5..00000000000
--- a/sql/updates/3.1.3_old/CMakeLists.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-FILE(GLOB _SQL_313 *.sql)
-
-INSTALL(FILES ${_SQL_313} DESTINATION share/trinity/sql/updates/3.1.3_old) \ No newline at end of file
diff --git a/sql/updates/3.2.2a_old/CMakeLists.txt b/sql/updates/3.2.2a_old/CMakeLists.txt
deleted file mode 100644
index 391d4895850..00000000000
--- a/sql/updates/3.2.2a_old/CMakeLists.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-FILE(GLOB _SQL_322 *.sql)
-
-INSTALL(FILES ${_SQL_322} DESTINATION share/trinity/sql/updates/3.2.2a_old) \ No newline at end of file
diff --git a/sql/updates/3.3.2_old/CMakeLists.txt b/sql/updates/3.3.2_old/CMakeLists.txt
deleted file mode 100644
index 75f051dcede..00000000000
--- a/sql/updates/3.3.2_old/CMakeLists.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-FILE(GLOB _SQL_332 *.sql)
-
-INSTALL(FILES ${_SQL_332} DESTINATION share/trinity/sql/updates/3.3.2_old) \ No newline at end of file
diff --git a/sql/updates/3.3.3a_old/CMakeLists.txt b/sql/updates/3.3.3a_old/CMakeLists.txt
deleted file mode 100644
index 8557b4d4bf3..00000000000
--- a/sql/updates/3.3.3a_old/CMakeLists.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-FILE(GLOB _SQL_333 *.sql)
-
-INSTALL(FILES ${_SQL_333} DESTINATION share/trinity/sql/updates/3.3.3a_old) \ No newline at end of file
diff --git a/sql/updates/3.3.5a_old/CMakeLists.txt b/sql/updates/3.3.5a_old/CMakeLists.txt
deleted file mode 100644
index 63cb6eab23e..00000000000
--- a/sql/updates/3.3.5a_old/CMakeLists.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-FILE(GLOB _SQL_335 *.sql)
-
-INSTALL(FILES ${_SQL_333} DESTINATION share/trinity/sql/updates/3.3.5a_old)
diff --git a/sql/updates/CMakeLists.txt b/sql/updates/CMakeLists.txt
deleted file mode 100644
index fca7e740f90..00000000000
--- a/sql/updates/CMakeLists.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-add_subdirectory(2.4.3_old)
-add_subdirectory(3.0.9_old)
-add_subdirectory(3.1.3_old)
-add_subdirectory(3.2.2a_old)
-add_subdirectory(3.3.2_old)
-add_subdirectory(3.3.3a_old)
-add_subdirectory(3.3.5a_old)
-
-FILE(GLOB _SQL_UPDATES *.sql)
-
-INSTALL(FILES ${_SQL_UPDATES} DESTINATION share/trinity/sql/updates)