Skip to content

Commit

Permalink
Only use libc++ on APPLE; remove LMMS_BUILD_CLANG define, as it's no …
Browse files Browse the repository at this point in the history 
…longer needed
  • Loading branch information
@Wallacoloo
Wallacoloo committed Feb 26, 2016
1 parent 1c0d329 commit 59276a0
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 6 deletions.
4 changes: 0 additions & 4 deletions cmake/modules/DetectMachine.cmake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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}")
Expand Down
2 changes: 1 addition & 1 deletion plugins/flp_import/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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()

Expand Down
2 changes: 1 addition & 1 deletion src/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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()

Expand Down

3 comments on commit 59276a0

@barracuda156
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Wallacoloo This is obviously wrong and gonna break build with GCC.

@Wallacoloo
Copy link
Member Author

@Wallacoloo Wallacoloo commented on 59276a0 Jul 29, 2023 via email

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@barracuda156
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Wallacoloo Thank you for responding! No issues, I have already opened a PR, with the following only Clang on Apple will get the flag passed:

IF(LMMS_BUILD_APPLE AND CMAKE_CXX_COMPILER_ID MATCHES "Clang")
 	SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++")
 ENDIF()

Please sign in to comment.