diff options
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/genrev.cmake | 4 | ||||
| -rw-r--r-- | cmake/macros/CheckBuildDir.cmake | 2 | ||||
| -rw-r--r-- | cmake/macros/FindGit.cmake | 2 | ||||
| -rw-r--r-- | cmake/options.cmake | 3 | ||||
| -rw-r--r-- | cmake/platform/unix/settings.cmake | 2 | ||||
| -rw-r--r-- | cmake/showoptions.cmake | 1 |
6 files changed, 7 insertions, 7 deletions
diff --git a/cmake/genrev.cmake b/cmake/genrev.cmake index b39a0780b1c..f4885f53e1c 100644 --- a/cmake/genrev.cmake +++ b/cmake/genrev.cmake @@ -1,4 +1,4 @@ -# Copyright (C) 2008-2013 Trinity <http://www.trinitycore.org/> +# Copyright (C) 2008-2014 TrinityCore <http://www.trinitycore.org/> # # This file is free software; as a special exception the author gives # unlimited permission to copy and/or distribute it, with or without @@ -58,7 +58,7 @@ else() # No valid ways available to find/set the revision/hash, so let's force some defaults message(STATUS " Could not find a proper repository signature (hash) - you may need to pull tags with git fetch -t - Continuing anyway - note that the versionstring will be set to \"unknown 1970-01-01 00:00:00 (Archived)"\") + Continuing anyway - note that the versionstring will be set to \"unknown 1970-01-01 00:00:00 (Archived)\"") set(rev_date "1970-01-01 00:00:00 +0000") set(rev_hash "unknown") set(rev_branch "Archived") diff --git a/cmake/macros/CheckBuildDir.cmake b/cmake/macros/CheckBuildDir.cmake index 3cc56dae47b..aff1caf362d 100644 --- a/cmake/macros/CheckBuildDir.cmake +++ b/cmake/macros/CheckBuildDir.cmake @@ -1,4 +1,4 @@ -# Copyright (C) 2008-2013 Trinity <http://www.trinitycore.org/> +# Copyright (C) 2008-2014 TrinityCore <http://www.trinitycore.org/> # # This file is free software; as a special exception the author gives # unlimited permission to copy and/or distribute it, with or without diff --git a/cmake/macros/FindGit.cmake b/cmake/macros/FindGit.cmake index c23601dbcd8..d8b82cb04fe 100644 --- a/cmake/macros/FindGit.cmake +++ b/cmake/macros/FindGit.cmake @@ -1,4 +1,4 @@ -# Copyright (C) 2008-2013 Trinity <http://www.trinitycore.org/> +# Copyright (C) 2008-2014 TrinityCore <http://www.trinitycore.org/> # # This file is free software; as a special exception the author gives # unlimited permission to copy and/or distribute it, with or without diff --git a/cmake/options.cmake b/cmake/options.cmake index ecd58019905..d4fc2f3b2d0 100644 --- a/cmake/options.cmake +++ b/cmake/options.cmake @@ -1,4 +1,4 @@ -# Copyright (C) 2008-2013 Trinity <http://www.trinitycore.org/> +# Copyright (C) 2008-2014 TrinityCore <http://www.trinitycore.org/> # # This file is free software; as a special exception the author gives # unlimited permission to copy and/or distribute it, with or without @@ -15,4 +15,5 @@ option(USE_SCRIPTPCH "Use precompiled headers when compiling scripts" option(USE_COREPCH "Use precompiled headers when compiling servers" 1) option(WITH_WARNINGS "Show all warnings during compile" 0) option(WITH_COREDEBUG "Include additional debug-code in core" 0) +option(WITH_MESHEXTRACTOR "Build meshextractor (alpha)" 0) option(WITHOUT_GIT "Disable the GIT testing routines" 0) diff --git a/cmake/platform/unix/settings.cmake b/cmake/platform/unix/settings.cmake index b0c0d260623..42bfefa6994 100644 --- a/cmake/platform/unix/settings.cmake +++ b/cmake/platform/unix/settings.cmake @@ -33,7 +33,7 @@ add_custom_target(uninstall message(STATUS "UNIX: Created uninstall target") message(STATUS "UNIX: Detected compiler: ${CMAKE_C_COMPILER}") -if(CMAKE_C_COMPILER MATCHES "gcc") +if(CMAKE_C_COMPILER MATCHES "gcc" OR CMAKE_C_COMPILER_ID STREQUAL "GNU") include(${CMAKE_SOURCE_DIR}/cmake/compiler/gcc/settings.cmake) elseif(CMAKE_C_COMPILER MATCHES "icc") include(${CMAKE_SOURCE_DIR}/cmake/compiler/icc/settings.cmake) diff --git a/cmake/showoptions.cmake b/cmake/showoptions.cmake index 08dc2a0cfcb..2d21136d661 100644 --- a/cmake/showoptions.cmake +++ b/cmake/showoptions.cmake @@ -28,7 +28,6 @@ if( SCRIPTS ) add_definitions(-DSCRIPTS) else() message("* Build with scripts : No") - set(USE_SCRIPTPCH 0) endif() if( TOOLS ) |