diff options
| author | kaelima <kaelima@live.se> | 2012-12-21 00:00:16 +0100 |
|---|---|---|
| committer | kaelima <kaelima@live.se> | 2012-12-21 00:00:16 +0100 |
| commit | 0a88787dfc747437b6278a044a425b6483e61b37 (patch) | |
| tree | 65942c84524890446a79ef67fd1ea2ce622a8544 /cmake/platform | |
| parent | 8f27dfda627903997b67cab9ebb4c5b365da201e (diff) | |
| parent | 4116ba75e3bef999c3111943c3b389ffc195b686 (diff) | |
Merge git://github.com/TrinityCore/TrinityCore into mmaps
Conflicts:
src/server/game/Entities/Vehicle/Vehicle.cpp
src/server/game/Movement/MovementGenerator.h
src/server/game/Movement/MovementGenerators/ConfusedMovementGenerator.cpp
src/server/game/Movement/MovementGenerators/ConfusedMovementGenerator.h
src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.cpp
src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.h
src/server/game/Movement/MovementGenerators/IdleMovementGenerator.cpp
src/server/game/Movement/MovementGenerators/IdleMovementGenerator.h
src/server/game/Movement/MovementGenerators/PointMovementGenerator.cpp
src/server/game/Movement/MovementGenerators/PointMovementGenerator.h
src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.cpp
src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.h
src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp
src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.h
src/server/game/Movement/Spline/MoveSpline.h
Diffstat (limited to 'cmake/platform')
| -rw-r--r-- | cmake/platform/osx/settings.cmake | 33 | ||||
| -rw-r--r-- | cmake/platform/unix/settings.cmake | 2 |
2 files changed, 2 insertions, 33 deletions
diff --git a/cmake/platform/osx/settings.cmake b/cmake/platform/osx/settings.cmake deleted file mode 100644 index 3d232c5a1f0..00000000000 --- a/cmake/platform/osx/settings.cmake +++ /dev/null @@ -1,33 +0,0 @@ -set(MACOSX 1) - -# set default configuration directory -if( NOT CONF_DIR ) - set(CONF_DIR ${CMAKE_INSTALL_PREFIX}/etc) - message(STATUS "OSX: Using default configuration directory") -endif() - -# set default library directory -if( NOT LIBSDIR ) - set(LIBSDIR ${CMAKE_INSTALL_PREFIX}/lib) - message(STATUS "OSX: Using default library directory") -endif() - -# configure uninstaller -configure_file( - "${CMAKE_SOURCE_DIR}/cmake/platform/cmake_uninstall.in.cmake" - "${CMAKE_BINARY_DIR}/cmake_uninstall.cmake" - IMMEDIATE @ONLY -) -message(STATUS "OSX: Configuring uninstall target") - -# create uninstaller target (allows for using "make uninstall") -add_custom_target(uninstall - "${CMAKE_COMMAND}" -P "${CMAKE_BINARY_DIR}/cmake_uninstall.cmake" -) -message(STATUS "OSX: Created uninstall target") - -if (CMAKE_COMPILER_IS_GNUCC) - include(${CMAKE_SOURCE_DIR}/cmake/compiler/gcc/settings.cmake) -elseif (${CMAKE_CXX_COMPILER_ID} MATCHES "Clang") - include(${CMAKE_SOURCE_DIR}/cmake/compiler/clang/settings.cmake) -endif() diff --git a/cmake/platform/unix/settings.cmake b/cmake/platform/unix/settings.cmake index c79cfc4ed4f..a851c8acf7a 100644 --- a/cmake/platform/unix/settings.cmake +++ b/cmake/platform/unix/settings.cmake @@ -36,4 +36,6 @@ if(CMAKE_C_COMPILER MATCHES "gcc") include(${CMAKE_SOURCE_DIR}/cmake/compiler/gcc/settings.cmake) elseif(CMAKE_C_COMPILER MATCHES "icc") include(${CMAKE_SOURCE_DIR}/cmake/compiler/icc/settings.cmake) +elseif(CMAKE_C_COMPILER MATCHES "clang") + include(${CMAKE_SOURCE_DIR}/cmake/compiler/clang/settings.cmake) endif() |