diff --git a/pika-tools/aof_to_pika/CMakeLists.txt b/pika-tools/aof_to_pika/CMakeLists.txt index e761ae3c47..867f832366 100644 --- a/pika-tools/aof_to_pika/CMakeLists.txt +++ b/pika-tools/aof_to_pika/CMakeLists.txt @@ -1,5 +1,4 @@ -set(CXXFLAGS "-Wall -W -DDEBUG -g -O0 -D__XDEBUG__ -fPIC -Wno-unused-function -std=c++11" -) +set(CXXFLAGS "-Wall -W -DDEBUG -g -O0 -D__XDEBUG__ -fPIC -Wno-unused-function -std=c++11") set(SRC_DIR ./src) aux_source_directory(${SRC_DIR} BASE_OBJS) @@ -8,8 +7,9 @@ add_executable(aof_to_pika ${BASE_OBJS}) target_include_directories(aof_to_pika PRIVATE ./include PRIVATE ../..) -target_link_libraries(aof_to_pika pthread) +target_link_libraries(aof_to_pika pthread) set_target_properties(aof_to_pika PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/pika_tools CMAKE_COMPILER_IS_GNUCXX TRUE - COMPILE_FLAGS ${CXXFLAGS}) \ No newline at end of file + COMPILE_FLAGS ${CXXFLAGS}) + diff --git a/pika-tools/aof_to_pika/Makefile b/pika-tools/aof_to_pika/Makefile deleted file mode 100644 index f0a3c3871f..0000000000 --- a/pika-tools/aof_to_pika/Makefile +++ /dev/null @@ -1,38 +0,0 @@ -CXX = g++ -CXXFLAGS = -Wall -W -DDEBUG -g -O0 -D__XDEBUG__ -fPIC -Wno-unused-function -std=c++11 -OBJECT = aof_to_pika -SRC_DIR = ./src -OUTPUT = ./output - -INCLUDE_PATH = -I./include -I../.. - -LIBS = -lpthread - -.PHONY: all clean - - -BASE_OBJS := $(wildcard $(SRC_DIR)/*.cc) -BASE_OBJS += $(wildcard $(SRC_DIR)/*.c) -BASE_OBJS += $(wildcard $(SRC_DIR)/*.cpp) -OBJS = $(patsubst %.cc,%.o,$(BASE_OBJS)) - - -all: $(OBJECT) - rm -rf $(OUTPUT) - mkdir $(OUTPUT) - mkdir $(OUTPUT)/bin - cp $(OBJECT) $(OUTPUT)/bin/ - rm -rf $(OBJECT) - @echo "Success, go, go, go..." - - -$(OBJECT): $(OBJS) - $(CXX) $(CXXFLAGS) -o $@ $(OBJS) $(INCLUDE_PATH) $(LIBS) - -$(OBJS): %.o : %.cc - $(CXX) $(CXXFLAGS) -c $< -o $@ $(INCLUDE_PATH) - -clean: - rm -rf $(SRC_DIR)/*.o - rm -rf $(OUTPUT)/* - rm -rf $(OUTPUT)