mirror of
https://github.com/jmcnamara/libxlsxwriter
synced 2025-03-28 21:13:14 +00:00
Minor makefile refactoring.
This commit is contained in:
parent
a4a4d9ab0a
commit
aae4263754
25
319.patch
Normal file
25
319.patch
Normal file
@ -0,0 +1,25 @@
|
|||||||
|
From c1ab1d9e7018dcdc7eb81082647ac85a490ddcfb Mon Sep 17 00:00:00 2001
|
||||||
|
From: Andreas Naumann <andreas.naumann@mathematik.tu-chemnitz.de>
|
||||||
|
Date: Mon, 21 Dec 2020 18:50:14 +0100
|
||||||
|
Subject: [PATCH] resolve issue 318
|
||||||
|
|
||||||
|
---
|
||||||
|
CMakeLists.txt | 4 ++--
|
||||||
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||||
|
index 23599338..b408fc67 100644
|
||||||
|
--- a/CMakeLists.txt
|
||||||
|
+++ b/CMakeLists.txt
|
||||||
|
@@ -94,9 +94,9 @@ else()
|
||||||
|
cmake_minimum_required(VERSION 3.1)
|
||||||
|
endif()
|
||||||
|
|
||||||
|
-SET(PROJECT_NAME "xlsxwriter" CACHE STRING "Optional project and binary name")
|
||||||
|
+SET(XLSX_PROJECT_NAME "xlsxwriter" CACHE STRING "Optional project and binary name")
|
||||||
|
set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
|
||||||
|
-project(${PROJECT_NAME} C)
|
||||||
|
+project(${XLSX_PROJECT_NAME} C)
|
||||||
|
enable_testing()
|
||||||
|
|
||||||
|
# POLICY
|
5
Makefile
5
Makefile
@ -63,7 +63,6 @@ clean :
|
|||||||
$(Q)rm -rf test/functional/__pycache__
|
$(Q)rm -rf test/functional/__pycache__
|
||||||
$(Q)rm -f test/functional/*.pyc
|
$(Q)rm -f test/functional/*.pyc
|
||||||
$(Q)rm -f lib/*
|
$(Q)rm -f lib/*
|
||||||
$(Q)rm -f xlsxwriter.pc
|
|
||||||
ifndef USE_SYSTEM_MINIZIP
|
ifndef USE_SYSTEM_MINIZIP
|
||||||
$(Q)$(MAKE) clean -C third_party/minizip
|
$(Q)$(MAKE) clean -C third_party/minizip
|
||||||
endif
|
endif
|
||||||
@ -146,7 +145,7 @@ docs_doxygen_only:
|
|||||||
docs_external:
|
docs_external:
|
||||||
$(Q)make -C ../libxlsxwriter.github.io release
|
$(Q)make -C ../libxlsxwriter.github.io release
|
||||||
|
|
||||||
# Simple minded install.
|
# Simple install.
|
||||||
install: all
|
install: all
|
||||||
$(Q)mkdir -p $(DESTDIR)$(PREFIX)/include
|
$(Q)mkdir -p $(DESTDIR)$(PREFIX)/include
|
||||||
$(Q)cp -R include/* $(DESTDIR)$(PREFIX)/include
|
$(Q)cp -R include/* $(DESTDIR)$(PREFIX)/include
|
||||||
@ -155,7 +154,7 @@ install: all
|
|||||||
$(Q)mkdir -p $(DESTDIR)$(PREFIX)/lib/pkgconfig
|
$(Q)mkdir -p $(DESTDIR)$(PREFIX)/lib/pkgconfig
|
||||||
$(Q)sed -e 's|@PREFIX@|$(PREFIX)|g' -e 's|@VERSION@|$(VERSION)|g' dev/release/pkg-config.txt > $(DESTDIR)$(PREFIX)/lib/pkgconfig/xlsxwriter.pc
|
$(Q)sed -e 's|@PREFIX@|$(PREFIX)|g' -e 's|@VERSION@|$(VERSION)|g' dev/release/pkg-config.txt > $(DESTDIR)$(PREFIX)/lib/pkgconfig/xlsxwriter.pc
|
||||||
|
|
||||||
# Simpler minded uninstall.
|
# Simpler uninstall.
|
||||||
uninstall:
|
uninstall:
|
||||||
$(Q)rm -rf $(DESTDIR)$(PREFIX)/include/xlsxwriter*
|
$(Q)rm -rf $(DESTDIR)$(PREFIX)/include/xlsxwriter*
|
||||||
$(Q)rm $(DESTDIR)$(PREFIX)/lib/libxlsxwriter.*
|
$(Q)rm $(DESTDIR)$(PREFIX)/lib/libxlsxwriter.*
|
||||||
|
Loading…
x
Reference in New Issue
Block a user