Commit ff7b01d8 authored by unknown's avatar unknown
Browse files

Makefile.am: 

  Don't install benchmark executable
CMakeLists.txt:
  Handle CMAKE_C_FLAGS_RELWITHDEBINFO and CMAKE_CXX_FLAGS_RELWITHDEBINFO


extra/yassl/taocrypt/benchmark/Makefile.am:
  Don't install benchmark executable
CMakeLists.txt:
  Handle CMAKE_C_FLAGS_RELWITHDEBINFO and CMAKE_CXX_FLAGS_RELWITHDEBINFO
mysys/CMakeLists.txt:
  Handle CMAKE_C_FLAGS_RELWITHDEBINFO and CMAKE_CXX_FLAGS_RELWITHDEBINFO
parent fe6bc373

CMakeLists.txt

+8 −0
Original line number Diff line number Diff line
@@ -86,13 +86,17 @@ ENDIF(CYBOZU) 


# in some places we use DBUG_OFF

SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -D DBUG_OFF")

SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -D DBUG_OFF")

SET(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -D DBUG_OFF")

SET(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} -D DBUG_OFF")



IF(CMAKE_GENERATOR MATCHES "Visual Studio 8")

    SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /wd4996")

    SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /wd4996")

    SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /wd4996")

    SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /wd4996")

    SET(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} /wd4996")

    SET(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} /wd4996")

ENDIF(CMAKE_GENERATOR MATCHES "Visual Studio 8")



IF(CMAKE_GENERATOR MATCHES "Visual Studio 7" OR
@@ -104,10 +108,14 @@ IF(CMAKE_GENERATOR MATCHES "Visual Studio 7" OR 
	       ${CMAKE_C_FLAGS_DEBUG_INIT})

	STRING(REPLACE "/MD" "/MT" CMAKE_C_FLAGS_RELEASE 

	       ${CMAKE_C_FLAGS_RELEASE})

	STRING(REPLACE "/MD" "/MT" CMAKE_C_FLAGS_RELWITHDEBINFO 

	       ${CMAKE_C_FLAGS_RELWITHDEBINFO})

	STRING(REPLACE "/MDd" "/MTd" CMAKE_C_FLAGS_DEBUG 

	       ${CMAKE_C_FLAGS_DEBUG})

	STRING(REPLACE "/MD" "/MT" CMAKE_CXX_FLAGS_RELEASE 

	       ${CMAKE_CXX_FLAGS_RELEASE})

	STRING(REPLACE "/MD" "/MT" CMAKE_CXX_FLAGS_RELWITHDEBINFO 

	       ${CMAKE_CXX_FLAGS_RELWITHDEBINFO})

	STRING(REPLACE "/MDd" "/MTd" CMAKE_CXX_FLAGS_DEBUG 

	       ${CMAKE_CXX_FLAGS_DEBUG})

extra/yassl/taocrypt/benchmark/Makefile.am

+1 −1
Original line number Diff line number Diff line 
INCLUDES = -I$(srcdir)/../include -I$(srcdir)/../mySTL

bin_PROGRAMS       = benchmark

noinst_PROGRAMS    = benchmark

benchmark_SOURCES  = benchmark.cpp

benchmark_LDADD    = $(top_builddir)/extra/yassl/taocrypt/src/libtaocrypt.la

benchmark_CXXFLAGS = -DYASSL_PURE_C

mysys/CMakeLists.txt

+2 −0
Original line number Diff line number Diff line
@@ -22,7 +22,9 @@ SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX") 
# Currently, USE_TLS crashes in Debug builds, so until that is fixed Debug

# .dlls cannot be loaded at runtime.

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

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

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

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



INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/zlib ${CMAKE_SOURCE_DIR}/include ${CMAKE_SOURCE_DIR}/mysys )

ADD_LIBRARY(mysys array.c charset-def.c charset.c checksum.c default.c default_modify.c