Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-16 07:30:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Buildsystem: Start cleaning up the mess created after "implementing" support for clang/OSX-based compiles - initial cleanup, more will come

Browse Source 
If OSX-compile fucks up because of this, then report fixes on the tracker as usual, not through hotpatches going through other lead devs.
This commit is contained in:
click
2012-11-26 22:42:23 +01:00
parent bdbafc0184
commit 4762ad726f
3 changed files with 2 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/macros/CheckPlatform.cmake
View File

@@ -11,8 +11,6 @@ include("${CMAKE_SOURCE_DIR}/cmake/platform/settings.cmake")
if(WIN32)
include("${CMAKE_SOURCE_DIR}/cmake/platform/win/settings.cmake")
elseif(APPLE)
include("${CMAKE_SOURCE_DIR}/cmake/platform/osx/settings.cmake")
elseif(UNIX)
include("${CMAKE_SOURCE_DIR}/cmake/platform/unix/settings.cmake")
endif()

33
cmake/platform/osx/settings.cmake
View File

@@ -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()

2
cmake/platform/unix/settings.cmake
View File

@@ -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()