Commit 1409b8f5 authored by df@pippilotta.erinye.com's avatar df@pippilotta.erinye.com
Browse files

Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work-28358 

into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0.42
parents 7d006ee5 e8159fd0

CMakeLists.txt

+5 −0
Original line number Diff line number Diff line
@@ -154,6 +154,11 @@ IF(EMBED_MANIFESTS) 
    # Disable automatic manifest generation.

    STRING(REPLACE "/MANIFEST" "/MANIFEST:NO" CMAKE_EXE_LINKER_FLAGS 

    	   ${CMAKE_EXE_LINKER_FLAGS})

    # Explicitly disable it since it is the default for newer versions of VS

    STRING(REGEX MATCH "MANIFEST:NO" tmp_manifest ${CMAKE_EXE_LINKER_FLAGS})

    IF(NOT tmp_manifest)

        SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /MANIFEST:NO")

    ENDIF(tmp_manifest)

    # Set the processor architecture.

    IF(CMAKE_GENERATOR MATCHES "Visual Studio 8 2005 Win64")

    	SET(PROCESSOR_ARCH "X64")

libmysql/CMakeLists.txt

+4 −0
Original line number Diff line number Diff line
@@ -18,6 +18,10 @@ INCLUDE("${PROJECT_SOURCE_DIR}/win/mysql_manifest.cmake") 
# storage does not work properly in DLLs.

SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX -DUSE_TLS")

SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX -DUSE_TLS")

SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -DSAFEMALLOC -DSAFE_MUTEX -DUSE_TLS")

SET(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -DSAFEMALLOC -DSAFE_MUTEX -DUSE_TLS")

SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -DSAFEMALLOC -DSAFE_MUTEX -DUSE_TLS")

SET(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} -DSAFEMALLOC -DSAFE_MUTEX -DUSE_TLS")



INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include 

                    ${CMAKE_SOURCE_DIR}/zlib