From d88f40b836cd7e93c11e6d3e724b7b1eb43263c0 Mon Sep 17 00:00:00 2001 From: nick black Date: Fri, 1 Mar 2024 08:13:49 -0500 Subject: [PATCH] CMake: USE_CXX oughtn't restrict NOTCURSES_HEADERS --- CMakeLists.txt | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5c8a23f26..ef033aaad 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -548,6 +548,23 @@ target_compile_options(notcurses++ -fPIC ) +target_compile_options(notcurses++-static + PRIVATE + ${NCPP_COMPILE_OPTIONS} + -fPIE +) + +target_compile_definitions(notcurses++ + PUBLIC + ${NCPP_COMPILE_DEFINITIONS_PUBLIC} +) + +target_compile_definitions(notcurses++-static + PUBLIC + ${NCPP_COMPILE_DEFINITIONS_PUBLIC} +) +endif() + target_compile_options(notcurses-core PRIVATE -fPIC @@ -568,22 +585,6 @@ target_compile_options(notcurses-static -fPIE ) -target_compile_options(notcurses++-static - PRIVATE - ${NCPP_COMPILE_OPTIONS} - -fPIE -) - -target_compile_definitions(notcurses++ - PUBLIC - ${NCPP_COMPILE_DEFINITIONS_PUBLIC} -) - -target_compile_definitions(notcurses++-static - PUBLIC - ${NCPP_COMPILE_DEFINITIONS_PUBLIC} -) - file(GLOB NOTCURSES_HEADERS CONFIGURE_DEPENDS LIST_DIRECTORIES false @@ -599,7 +600,6 @@ file(GLOB NCPP_INTERNAL_HEADERS CONFIGURE_DEPENDS LIST_DIRECTORIES false ${PROJECT_SOURCE_DIR}/include/ncpp/internal/*.hh) -endif() export(PACKAGE notcurses)