From 180ee60c7af0e303272db6cec344f7b45dec3018 Mon Sep 17 00:00:00 2001 From: Rafael Kitover Date: Sat, 19 Nov 2016 17:13:49 -0800 Subject: [PATCH] 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. --- CMakeLists.txt | 7 ------- 1 file changed, 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 95f8e4bf..6f0a7592 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -90,7 +90,6 @@ ELSE() ENDIF() # Add support for Homebrew, MacPorts and Fink on OS X -# as well as for ObjectiveC code IF(APPLE) IF(EXISTS /usr/local/include) SET(CMAKE_INCLUDE_PATH "${CMAKE_INCLUDE_PATH};/usr/local/include") @@ -114,12 +113,6 @@ IF(APPLE) LINK_DIRECTORIES("/sw/lib") 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) SET(CMAKE_PROGRAM_PATH "${CMAKE_PROGRAM_PATH};/usr/local/bin") IF(EXISTS "/usr/local/bin/nasm")