diff options
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/macros/CheckPlatform.cmake | 2 | ||||
| -rw-r--r-- | cmake/platform/osx/settings.cmake | 33 | ||||
| -rw-r--r-- | cmake/platform/unix/settings.cmake | 2 |
3 files changed, 2 insertions, 35 deletions
diff --git a/cmake/macros/CheckPlatform.cmake b/cmake/macros/CheckPlatform.cmake index addc619207f..e08aaed8db2 100644 --- a/cmake/macros/CheckPlatform.cmake +++ b/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() 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() |