From patchwork Tue Nov 11 10:51:29 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yousong Zhou X-Patchwork-Id: 418557 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from arrakis.dune.hu (arrakis.dune.hu [78.24.191.176]) (using TLSv1.1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id A7F631400E2 for ; Mon, 8 Dec 2014 13:51:16 +1100 (AEDT) Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id 38A3A28C073; Mon, 8 Dec 2014 03:49:13 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on arrakis.dune.hu X-Spam-Level: X-Spam-Status: No, score=-0.3 required=5.0 tests=BAYES_00, DATE_IN_PAST_96_XX, FREEMAIL_FROM,T_DKIM_INVALID autolearn=no version=3.3.2 Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id EC7F428C072 for ; Mon, 8 Dec 2014 03:49:08 +0100 (CET) X-policyd-weight: using cached result; rate: -8.5 Received: from mail-pa0-f53.google.com (mail-pa0-f53.google.com [209.85.220.53]) by arrakis.dune.hu (Postfix) with ESMTPS for ; Mon, 8 Dec 2014 03:49:08 +0100 (CET) Received: by mail-pa0-f53.google.com with SMTP id kq14so4237152pab.26 for ; Sun, 07 Dec 2014 18:50:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=+AprAuBaW3OQPdn9eZ6lULdONpisVXx4ozp/gFc9mRM=; b=liSI2+Vg4sr6xd9o+RTvxPZwqU2mqjBQPxOL09XLzVNqzFJQawUzpJOTU+Nc8WN9jA 9ztEBjAApSHtO/VJb9GG100ISEI5B3t2iEuAeSKeqXGCO2xuyZkiyVbwpKIuSr1bltQj jxOfmCFKAaXyo1ipR7KK1UiBopj5Bm/BBqsQ2SgxezDVAHavu7USVFVX5kWuA5A0slyt FPq1DtKzj9ifkKIasPwP/yc7hoNH5OaPO4a6Ox8Y4YFUGeLM0uNt1tIJIXz8eauKRBgh vqMZ+SjZ6woS2FLrEQ2ot24abLANcbz7gHMGxWocuhbBJXTQbnJueEEDG6GDjB4Xhrcw 9Mxg== X-Received: by 10.70.2.164 with SMTP id 4mr16996086pdv.24.1418007049466; Sun, 07 Dec 2014 18:50:49 -0800 (PST) Received: from debian.lan ([103.29.140.56]) by mx.google.com with ESMTPSA id fn5sm34940623pdb.55.2014.12.07.18.50.46 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 07 Dec 2014 18:50:48 -0800 (PST) From: Yousong Zhou To: openwrt-devel@lists.openwrt.org Date: Tue, 11 Nov 2014 18:51:29 +0800 Message-Id: <1415703092-46458-2-git-send-email-yszhou4tech@gmail.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1415703092-46458-1-git-send-email-yszhou4tech@gmail.com> References: <1415703092-46458-1-git-send-email-yszhou4tech@gmail.com> Subject: [OpenWrt-Devel] [PATCH 2/5] lua: do not hardcode /opt/local/include for Apple. X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: openwrt-devel-bounces@lists.openwrt.org Sender: "openwrt-devel" Signed-off-by: Yousong Zhou --- CMakeLists.txt | 5 ----- examples/CMakeLists.txt | 5 ----- lua/CMakeLists.txt | 1 - 3 files changed, 11 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 737f2ae..4b1570c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,11 +7,6 @@ ADD_DEFINITIONS(-Os -Wall -Werror --std=gnu99 -g3 -Wmissing-declarations) OPTION(BUILD_LUA "build Lua plugin" ON) -IF(APPLE) - INCLUDE_DIRECTORIES(/opt/local/include) - LINK_DIRECTORIES(/opt/local/lib) -ENDIF() - INCLUDE(FindPkgConfig) PKG_CHECK_MODULES(JSONC json-c) IF(JSONC_FOUND) diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt index 2126d29..a466dd6 100644 --- a/examples/CMakeLists.txt +++ b/examples/CMakeLists.txt @@ -3,11 +3,6 @@ cmake_minimum_required(VERSION 2.6) PROJECT(ubox-examples C) ADD_DEFINITIONS(-O1 -Wall -Werror --std=gnu99 -g3) -IF(APPLE) - INCLUDE_DIRECTORIES(/opt/local/include) - LINK_DIRECTORIES(/opt/local/lib) -ENDIF() - INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/..) LINK_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/..) diff --git a/lua/CMakeLists.txt b/lua/CMakeLists.txt index 04abe0c..10c6dc1 100644 --- a/lua/CMakeLists.txt +++ b/lua/CMakeLists.txt @@ -19,7 +19,6 @@ ADD_DEFINITIONS(-Os -Wall -Werror --std=gnu99 -g3 -I.. ${LUA_CFLAGS}) LINK_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/..) IF(APPLE) - ADD_DEFINITIONS(-I/opt/local/include) SET(CMAKE_SHARED_MODULE_CREATE_C_FLAGS "${CMAKE_SHARED_MODULE_CREATE_C_FLAGS} -undefined dynamic_lookup") ENDIF(APPLE)