Merge pull request #2609 from Wallacoloo/clang-fixes

Only use libc++ on when using clang *on apple*
LMMS · Feb 26, 2016 · e56c31b · e56c31b
2 parents c976514 + 59276a0
commit e56c31b
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 6 deletions.
diff --git a/cmake/modules/DetectMachine.cmake b/cmake/modules/DetectMachine.cmake
@@ -8,10 +8,6 @@ ELSE()
 	SET(LMMS_BUILD_LINUX 1)
 ENDIF(WIN32)
 
-IF(${CMAKE_CXX_COMPILER_ID} MATCHES "Clang")
-	SET(LMMS_BUILD_CLANG 1)
-ENDIF()
-
 # See build_mingwXX.sh for LMMS_BUILD_MSYS
 
 MESSAGE("PROCESSOR: ${CMAKE_SYSTEM_PROCESSOR}")

diff --git a/plugins/flp_import/CMakeLists.txt b/plugins/flp_import/CMakeLists.txt
@@ -5,7 +5,7 @@ INCLUDE_DIRECTORIES(unrtf)
 # Enable C++11
 ADD_DEFINITIONS(-std=c++0x)
 
-IF(LMMS_BUILD_CLANG)
+IF(LMMS_BUILD_APPLE)
         SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++")
 ENDIF()
 

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -10,7 +10,7 @@ SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
 # Enable C++11
 ADD_DEFINITIONS(-std=c++0x)
 
-IF(LMMS_BUILD_CLANG)
+IF(LMMS_BUILD_APPLE)
 	SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++")
 ENDIF()