Skip to content
Browse files

Core/Buildsystem: Start cleaning up the mess created after "implement…

…ing" support for clang/OSX-based compiles - initial cleanup, more will come

If OSX-compile fucks up because of this, then report fixes on the tracker as usual, not through hotpatches going through other lead devs.
  • Loading branch information...
1 parent bdbafc0 commit 4762ad726f9fb95c7236a8eb12e745ac8435469b @click click committed Nov 26, 2012
Showing with 2 additions and 35 deletions.
  1. +0 −2 cmake/macros/CheckPlatform.cmake
  2. +0 −33 cmake/platform/osx/settings.cmake
  3. +2 −0 cmake/platform/unix/settings.cmake
View
2 cmake/macros/CheckPlatform.cmake
@@ -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()
View
33 cmake/platform/osx/settings.cmake
@@ -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()
View
2 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()

0 comments on commit 4762ad7

Please sign in to comment.
Something went wrong with that request. Please try again.