From 3237ebafaa36ccc114a4274ff9ca9f5dfe61821b Mon Sep 17 00:00:00 2001 From: Baruch Sterin Date: Thu, 12 Nov 2015 11:43:59 -0800 Subject: CMake, Makefile: pass the location of arch_flags to the makefile, this way the cmake build does not write to the soruce directory --- CMakeLists.txt | 1 + Makefile | 8 +++++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 04b882d0..977f0938 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -53,6 +53,7 @@ execute_process( make ${ABC_READLINE_FLAGS} ${ABC_USE_NAMESPACE} + ARCHFLAGS_EXE=${CMAKE_CURRENT_BINARY_DIR}/abc_arch_flags_program.exe ABC_MAKE_NO_DEPS=1 CC=${CMAKE_C_COMPILER} CXX=${CMAKE_CXX_COMPILER} diff --git a/Makefile b/Makefile index 4b5190d0..f05d39b5 100644 --- a/Makefile +++ b/Makefile @@ -34,12 +34,14 @@ MODULES := \ all: $(PROG) default: $(PROG) -arch_flags : arch_flags.c - $(CC) arch_flags.c -o arch_flags +ARCHFLAGS_EXE ?= ./arch_flags + +$(ARCHFLAGS_EXE) : arch_flags.c + $(CC) arch_flags.c -o $(ARCHFLAGS_EXE) INCLUDES += -Isrc -ARCHFLAGS ?= $(shell $(CC) arch_flags.c -o arch_flags && ./arch_flags) +ARCHFLAGS ?= $(shell $(CC) arch_flags.c -o $(ARCHFLAGS_EXE) && $(ARCHFLAGS_EXE)) ARCHFLAGS := $(ARCHFLAGS) OPTFLAGS ?= -g -O -- cgit v1.2.3