clean up APPLE block in main CMakeLists.txt
Remove some redundant nasm-related code and an outdated comment. Objective-C++ code is now separated into an .mm file and nothing is done to change the compiler invocation for it.
This commit is contained in:
parent
40dcb2df7a
commit
180ee60c7a
|
@ -90,7 +90,6 @@ ELSE()
|
||||||
ENDIF()
|
ENDIF()
|
||||||
|
|
||||||
# Add support for Homebrew, MacPorts and Fink on OS X
|
# Add support for Homebrew, MacPorts and Fink on OS X
|
||||||
# as well as for ObjectiveC code
|
|
||||||
IF(APPLE)
|
IF(APPLE)
|
||||||
IF(EXISTS /usr/local/include)
|
IF(EXISTS /usr/local/include)
|
||||||
SET(CMAKE_INCLUDE_PATH "${CMAKE_INCLUDE_PATH};/usr/local/include")
|
SET(CMAKE_INCLUDE_PATH "${CMAKE_INCLUDE_PATH};/usr/local/include")
|
||||||
|
@ -114,12 +113,6 @@ IF(APPLE)
|
||||||
LINK_DIRECTORIES("/sw/lib")
|
LINK_DIRECTORIES("/sw/lib")
|
||||||
ENDIF()
|
ENDIF()
|
||||||
|
|
||||||
IF(EXISTS "/usr/local/bin/nasm")
|
|
||||||
SET(CMAKE_ASM_NASM_COMPILER "/usr/local/bin/nasm")
|
|
||||||
ELSEIF(EXISTS "/opt/local/bin/nasm")
|
|
||||||
SET(CMAKE_ASM_NASM_COMPILER "/opt/local/bin/nasm")
|
|
||||||
ENDIF()
|
|
||||||
|
|
||||||
IF(EXISTS /usr/local/bin)
|
IF(EXISTS /usr/local/bin)
|
||||||
SET(CMAKE_PROGRAM_PATH "${CMAKE_PROGRAM_PATH};/usr/local/bin")
|
SET(CMAKE_PROGRAM_PATH "${CMAKE_PROGRAM_PATH};/usr/local/bin")
|
||||||
IF(EXISTS "/usr/local/bin/nasm")
|
IF(EXISTS "/usr/local/bin/nasm")
|
||||||
|
|
Loading…
Reference in New Issue