diff options
| author | unknown <kent@mysql.com/kent-amd64.(none)> | 2007-08-03 21:51:37 +0200 |
|---|---|---|
| committer | unknown <kent@mysql.com/kent-amd64.(none)> | 2007-08-03 21:51:37 +0200 |
| commit | 29bd01e6c11c0d9df7f556f157b1b00e06306f60 (patch) | |
| tree | e1463cc69b98560699aa561754652f5db4e1e3a2 /dbug | |
| parent | 5000893f39d0b885ebfad9c5ae7d2da83962ee9a (diff) | |
| download | mariadb-git-29bd01e6c11c0d9df7f556f157b1b00e06306f60.tar.gz | |
CMakeLists.txt, README, configure.js
Several adjustments to make client libraries pass the link test
on both win32 and winx64, Visual Studio 2003 and 2005 (bug#30118)
win/README:
- Removed references to PARTITION engine, 5.1 only
win/configure.js:
- Removed references to PARTITION engine, 5.1 only
extra/CMakeLists.txt:
Use the special 'debug' list element to mark that "dbug" library
is only to be linked against if build type "Debug".
myisam/CMakeLists.txt:
Use the special 'debug' list element to mark that "dbug" library
is only to be linked against if build type "Debug".
scripts/CMakeLists.txt:
Use the special 'debug' list element to mark that "dbug" library
is only to be linked against if build type "Debug".
server-tools/instance-manager/CMakeLists.txt:
Use the special 'debug' list element to mark that "dbug" library
is only to be linked against if build type "Debug".
sql/CMakeLists.txt:
Use the special 'debug' list element to mark that "dbug" library
is only to be linked against if build type "Debug".
mysys/CMakeLists.txt:
Restored include path to "mysys" itself
dbug/CMakeLists.txt:
Changed to optionally be included to give a file list only
extra/yassl/CMakeLists.txt:
Changed to optionally be included to give a file list only
extra/yassl/taocrypt/CMakeLists.txt:
Changed to optionally be included to give a file list only
zlib/CMakeLists.txt:
Changed to optionally be included to give a file list only
libmysql/CMakeLists.txt:
For compatibility with Visual Studio 2005, list all files that are to
be part of the library build, i.e. libraries can't be built from other
libraries. Set SOURCE_SUBLIBS and include the file listings from
"zlib", "dbug", "taocrypt" and "yassl"
Diffstat (limited to 'dbug')
| -rwxr-xr-x | dbug/CMakeLists.txt | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/dbug/CMakeLists.txt b/dbug/CMakeLists.txt index 34f44f9a720..8b27f79dcf4 100755 --- a/dbug/CMakeLists.txt +++ b/dbug/CMakeLists.txt @@ -13,7 +13,12 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX") +INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/dbug) -INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include) -ADD_LIBRARY(dbug dbug.c factorial.c sanity.c) +SET(DBUG_SOURCES dbug.c factorial.c sanity.c) + +IF(NOT SOURCE_SUBLIBS) + SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX") + INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include) + ADD_LIBRARY(dbug ${DBUG_SOURCES}) +ENDIF(NOT SOURCE_SUBLIBS) |