comparison Resources/CMake/Compiler.cmake @ 569:701d748cf327 laaw

fixes
author Sebastien Jodogne <s.jodogne@gmail.com>
date Wed, 25 Sep 2013 13:18:19 +0200
parents 6a3e2ca7a7a0
children ec2c2411d4db
comparison
equal deleted inserted replaced
568:3f27814104f7 569:701d748cf327
4 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wno-long-long -Wno-implicit-function-declaration") 4 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wno-long-long -Wno-implicit-function-declaration")
5 # --std=c99 makes libcurl not to compile 5 # --std=c99 makes libcurl not to compile
6 # -pedantic gives a lot of warnings on OpenSSL 6 # -pedantic gives a lot of warnings on OpenSSL
7 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -pedantic -Wno-long-long -Wno-variadic-macros") 7 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -pedantic -Wno-long-long -Wno-variadic-macros")
8 elseif (${MSVC}) 8 elseif (${MSVC})
9 # Use static runtime under Visual Studio
10 # http://www.cmake.org/Wiki/CMake_FAQ#Dynamic_Replace
9 # http://stackoverflow.com/a/6510446 11 # http://stackoverflow.com/a/6510446
10 foreach(flag_var 12 foreach(flag_var
11 CMAKE_C_FLAGS_DEBUG 13 CMAKE_C_FLAGS_DEBUG
12 CMAKE_CXX_FLAGS_DEBUG 14 CMAKE_CXX_FLAGS_DEBUG
13 CMAKE_C_FLAGS_RELEASE 15 CMAKE_C_FLAGS_RELEASE
17 CMAKE_C_FLAGS_RELWITHDEBINFO 19 CMAKE_C_FLAGS_RELWITHDEBINFO
18 CMAKE_CXX_FLAGS_RELWITHDEBINFO) 20 CMAKE_CXX_FLAGS_RELWITHDEBINFO)
19 string(REGEX REPLACE "/MD" "/MT" ${flag_var} "${${flag_var}}") 21 string(REGEX REPLACE "/MD" "/MT" ${flag_var} "${${flag_var}}")
20 string(REGEX REPLACE "/MDd" "/MTd" ${flag_var} "${${flag_var}}") 22 string(REGEX REPLACE "/MDd" "/MTd" ${flag_var} "${${flag_var}}")
21 endforeach(flag_var) 23 endforeach(flag_var)
24
22 add_definitions( 25 add_definitions(
23 -D_CRT_SECURE_NO_WARNINGS=1 26 -D_CRT_SECURE_NO_WARNINGS=1
24 -D_CRT_SECURE_NO_DEPRECATE=1 27 -D_CRT_SECURE_NO_DEPRECATE=1
25 ) 28 )
26 include_directories(${CMAKE_SOURCE_DIR}/Resources/VisualStudio) 29 include_directories(${CMAKE_SOURCE_DIR}/Resources/VisualStudio)