diff options
| author | unknown <knielsen@mysql.com> | 2006-03-28 13:49:29 +0200 |
|---|---|---|
| committer | unknown <knielsen@mysql.com> | 2006-03-28 13:49:29 +0200 |
| commit | 645f285391dc9b348546cb3a5405aba67ad75272 (patch) | |
| tree | 0ab6436926b8e47727166a5e1e772a27d418c910 /cmakelists.txt | |
| parent | fa780d44c64df04bb78d097e984b40fdf11edc84 (diff) | |
| download | mariadb-git-645f285391dc9b348546cb3a5405aba67ad75272.tar.gz | |
Clean up CMake configuration following review.
BitKeeper/deleted/.del-config-version.js~b31bb5a8:
Delete: win/config-version.js
BitKeeper/deleted/.del-config-handlerton.js~553d3402:
Delete: win/config-handlerton.js
cmakelists.txt:
Clean up configuration, better integration with CMake.
sql/cmakelists.txt:
Only build ha_xxx.cc for configured storage engines.
Only link with configured storage engine projects.
win/configure.js:
Move the task of config-version.js into configure.js.
Diffstat (limited to 'cmakelists.txt')
| -rw-r--r-- | cmakelists.txt | 36 |
1 files changed, 32 insertions, 4 deletions
diff --git a/cmakelists.txt b/cmakelists.txt index 5ed5069fb46..21a68752b32 100644 --- a/cmakelists.txt +++ b/cmakelists.txt @@ -1,8 +1,10 @@ PROJECT(MySql) -EXEC_PROGRAM(cscript.exe win ARGS config-version.js OUT_VARIABLE out) +# This reads user configuration, generated by configure.js. INCLUDE(win/configure.data) +CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/include/mysql_version.h.in ${CMAKE_SOURCE_DIR}/include/mysql_version.h @ONLY) + # in some places we use DBUG_OFF SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -D DBUG_OFF") SET(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -D DBUG_OFF") @@ -32,6 +34,32 @@ ENDIF(CMAKE_GENERATOR MATCHES "Visual Studio 7" OR CMAKE_GENERATOR MATCHES "Visu ADD_DEFINITIONS("-D_WINDOWS -D__WIN__ -D _CRT_SECURE_NO_DEPRECATE") -SUBDIRS(vio dbug strings regex mysys extra/yassl extra/yassl/taocrypt extra - zlib storage/heap storage/myisam storage/myisammrg client - ${se_subdirs} sql server-tools/instance-manager libmysql tests) +ADD_SUBDIRECTORY(vio) +ADD_SUBDIRECTORY(dbug) +ADD_SUBDIRECTORY(strings) +ADD_SUBDIRECTORY(regex) +ADD_SUBDIRECTORY(mysys) +ADD_SUBDIRECTORY(extra/yassl) +ADD_SUBDIRECTORY(extra/yassl/taocrypt) +ADD_SUBDIRECTORY(extra) +ADD_SUBDIRECTORY(zlib) +ADD_SUBDIRECTORY(storage/heap) +ADD_SUBDIRECTORY(storage/myisam) +ADD_SUBDIRECTORY(storage/myisammrg) +ADD_SUBDIRECTORY(client) +IF(WITH_ARCHIVE_STORAGE_ENGINE) + ADD_SUBDIRECTORY(storage/archive) +ENDIF(WITH_ARCHIVE_STORAGE_ENGINE) +IF(WITH_BERKELEY_STORAGE_ENGINE) + ADD_SUBDIRECTORY(storage/bdb) +ENDIF(WITH_BERKELEY_STORAGE_ENGINE) +IF(WITH_EXAMPLE_STORAGE_ENGINE) + ADD_SUBDIRECTORY(storage/example) +ENDIF(WITH_EXAMPLE_STORAGE_ENGINE) +IF(WITH_INNOBASE_STORAGE_ENGINE) + ADD_SUBDIRECTORY(storage/innobase) +ENDIF(WITH_INNOBASE_STORAGE_ENGINE) +ADD_SUBDIRECTORY(sql) +ADD_SUBDIRECTORY(server-tools/instance-manager) +ADD_SUBDIRECTORY(libmysql) +ADD_SUBDIRECTORY(tests) |