Skip to content

Commit bbc4316

Browse files
jamrialdariusz-f
authored andcommitted
Fix definition of OAPV_STATIC_DEFINE in the pkg-config for static only builds
The check in oapv.h will fail otherwise on builds with no shared libs, as oapv_exports.h is not installed and OAPV_STATIC_DEFINE will be defined only if pkg-config is invoked with --static. Signed-off-by: James Almer <jamrial@gmail.com>
1 parent c9d4f24 commit bbc4316

File tree

2 files changed

+9
-2
lines changed

2 files changed

+9
-2
lines changed

pkgconfig/oapv.pc.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,5 @@ Requires:
1313
Libs: -L${libdir} -l@LIB_NAME_BASE@
1414
Libs.private: -L${libdir}/@LIB_NAME_BASE@ -lm
1515

16-
Cflags: -I${includedir}
17-
Cflags.private: -DOAPV_STATIC_DEFINE
16+
Cflags: -I${includedir} @EXTRA_CFLAGS@
17+
Cflags.private: @EXTRA_CFLAGS_PRIVATE@

src/CMakeLists.txt

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -173,6 +173,13 @@ if(OAPV_BUILD_SHARED_LIB)
173173
endif()
174174

175175
if(NOT MSVC)
176+
if(OAPV_BUILD_SHARED_LIB)
177+
set(EXTRA_CFLAGS "")
178+
set(EXTRA_CFLAGS_PRIVATE "-DOAPV_STATIC_DEFINE")
179+
else()
180+
set(EXTRA_CFLAGS "-DOAPV_STATIC_DEFINE")
181+
set(EXTRA_CFLAGS_PRIVATE "")
182+
endif()
176183
configure_file(
177184
"${CMAKE_SOURCE_DIR}/pkgconfig/${LIB_NAME_BASE}.pc.in"
178185
"${CMAKE_BINARY_DIR}/${LIB_NAME_BASE}.pc" @ONLY)

0 commit comments

Comments
 (0)