From 2d9a7312eaac3702d802880b6a4a71c47604a86c Mon Sep 17 00:00:00 2001
From: Mathis Rosenhauer <rosenhauer@dkrz.de>
Date: Mon, 27 Feb 2023 13:30:43 +0100
Subject: [PATCH] Expand include path
---
src/CMakeLists.txt | 9 +++++----
src/Makefile.am | 3 ++-
tests/Makefile.am | 2 +-
3 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 59df411..6b9783e 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -15,8 +15,7 @@ add_library(aec_static STATIC "$<TARGET_OBJECTS:aec>")
target_link_libraries(aec_static PUBLIC aec)
set_target_properties(aec_static
PROPERTIES
- OUTPUT_NAME $<IF:$<BOOL:${MSVC}>,aec-static,aec>
-)
+ OUTPUT_NAME $<IF:$<BOOL:${MSVC}>,aec-static,aec>)
add_library(aec_shared SHARED "$<TARGET_OBJECTS:aec>")
target_link_libraries(aec_shared PUBLIC aec)
@@ -24,7 +23,8 @@ set_target_properties(aec_shared
PROPERTIES
VERSION 0.0.12
SOVERSION 0
- OUTPUT_NAME aec)
+ OUTPUT_NAME aec
+ PUBLIC_HEADER ${CMAKE_CURRENT_BINARY_DIR}/../include/libaec.h)
# Wrapper for compatibility with szip
add_library(sz OBJECT sz_compat.c)
@@ -43,7 +43,8 @@ set_target_properties(sz_shared
PROPERTIES
VERSION 2.0.1
SOVERSION 2
- OUTPUT_NAME $<IF:$<BOOL:${MSVC}>,szip,sz>)
+ OUTPUT_NAME $<IF:$<BOOL:${MSVC}>,szip,sz>
+ PUBLIC_HEADER ../include/szlib.h)
# Simple client for testing and benchmarking.
# Can also be used stand-alone
diff --git a/src/Makefile.am b/src/Makefile.am
index e263a22..823dfd2 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,5 +1,6 @@
AM_CFLAGS = $(CFLAG_VISIBILITY)
-AM_CPPFLAGS = -I$(top_srcdir)/include -DBUILDING_LIBAEC
+AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include \
+-DBUILDING_LIBAEC
lib_LTLIBRARIES = libaec.la libsz.la
libaec_la_SOURCES = encode.c encode_accessors.c decode.c \
encode.h encode_accessors.h decode.h
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 50b2036..d66304e 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,5 +1,5 @@
AUTOMAKE_OPTIONS = color-tests
-AM_CPPFLAGS = -I$(top_srcdir)/include
+AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include
TESTS = check_code_options check_buffer_sizes check_long_fs \
szcomp.sh sampledata.sh
TEST_EXTENSIONS = .sh
--
GitLab