diff options
author | click <none@none> | 2010-08-28 18:49:17 +0200 |
---|---|---|
committer | click <none@none> | 2010-08-28 18:49:17 +0200 |
commit | dcaeceaf6b3e4cfe16d5c5fbad7473dfb14ba4dd (patch) | |
tree | 90f05c04805999930494e76e6e286865a8c1a96a /cmake/compiler | |
parent | 8f97ba844089dfbf312babed6dc4dca24269ebc8 (diff) |
Buildsystem: Change over to a little more flexible method of using the CMake buildsystem (partially WIP) - REQUIRES RERUNNING CMAKE!
For finding out the "standard" parameters examine the cmake/options.cmake file and adjacent files for your platform/compiler.
For platform settings -> cmake/platform/*/settings.cmake
For compiler settings -> cmake/compiler/*/settings.cmake
Some more testing and changes IS required, but I don't have OSX/XCode to kill off the main issues
--HG--
branch : trunk
rename : cmake/FindPlatform.cmake => cmake/macros/CheckPlatform.cmake
rename : cmake/FindACE.cmake => cmake/macros/FindACE.cmake
rename : cmake/FindMySQL.cmake => cmake/macros/FindMySQL.cmake
rename : cmake/FindOpenSSL.cmake => cmake/macros/FindOpenSSL.cmake
rename : cmake/FindPCHSupport.cmake => cmake/macros/FindPCHSupport.cmake
rename : cmake/FindReadline.cmake => cmake/macros/FindReadline.cmake
rename : cmake/cmake_uninstall.cmake.in => cmake_uninstall.cmake.in
Diffstat (limited to 'cmake/compiler')
-rw-r--r-- | cmake/compiler/gcc/settings.cmake | 15 | ||||
-rw-r--r-- | cmake/compiler/msvc/settings.cmake | 49 |
2 files changed, 64 insertions, 0 deletions
diff --git a/cmake/compiler/gcc/settings.cmake b/cmake/compiler/gcc/settings.cmake new file mode 100644 index 00000000000..1d981509972 --- /dev/null +++ b/cmake/compiler/gcc/settings.cmake @@ -0,0 +1,15 @@ +add_definitions(-fno-delete-null-pointer-checks) + +if( USE_SFMT) + add_definitions(-msse2) +endif() + +if( WITH_WARNINGS ) + add_definitions(-Wall -Wfatal-errors -Wextra) +else() + add_definitions(--no-warnings) +endif() + +if( WITH_COREDEBUG ) + add_definitions(-ggdb3) +endif() diff --git a/cmake/compiler/msvc/settings.cmake b/cmake/compiler/msvc/settings.cmake new file mode 100644 index 00000000000..cea2911084b --- /dev/null +++ b/cmake/compiler/msvc/settings.cmake @@ -0,0 +1,49 @@ +# set up output paths for executable binaries (.exe-files, and .dll-files on DLL-capable platforms) +set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) + +# set up output paths ofr static libraries etc (commented out - shown here as an example only) +#set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) +#set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) + +# mark 32 bit executables large address aware so they can use > 2GB address space +if(CMAKE_SIZEOF_VOID_P MATCHES 4) + set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /LARGEADDRESSAWARE") + message(STATUS "- MSVC: Enabled large address awareness") +endif() + +# multithreaded compiling on VS +if((NOT USE_COREPCH) AND (NOT USE_SCRIPTPCH)) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP") + message(STATUS "- MSVC: PCH not used - enabled multithreaded compiling") +endif() + +# This definition is necessary to work around a bug with Intellisense described +# here: http://tinyurl.com/2cb428. Syntax highlighting is important for proper +# debugger functionality. + +if(${PLATFORM} STREQUAL "X64") + add_definitions("-D_WIN64") + message(STATUS "- MSVC: 64-bit platform, enforced -D_WIN64 parameter") +endif() + +# Defining _CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES as 1 eliminates the warning by changing the strcpy call to strcpy_s, which prevents buffer overruns +# DISABLED UNTILL FURTHER, NEEDS TESTING AND VERIFICATION +#add_definitions(-D_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES) +#message(STATUS "- MSVC: Overload standard names") + +# disable warnings in Visual Studio 8 and above if not wanted +if(NOT WITH_WARNINGS) + # Ignore warnings about older, less secure functions + add_definitions(-D_CRT_SECURE_NO_WARNINGS) + message(STATUS "- MSVC: Disabled NON-SECURE warnings") + + #Ignore warnings about POSIX deprecation + add_definitions(-D_CRT_NONSTDC_NO_WARNINGS) + message(STATUS "- MSVC: Disabled POSIX warnings") + + if(MSVC AND NOT CMAKE_GENERATOR MATCHES "Visual Studio 7") + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /wd4996 /wd4355 /wd4244 /wd4985 /wd4267 /wd4619") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4996 /wd4355 /wd4244 /wd4985 /wd4267 /wd4619") + message(STATUS "- MSVC: Disabled generic compiletime warnings") + endif() +endif() |