Skip to content

Commit

Permalink
only assign options to notcurses++ with USE_CXX
Browse files Browse the repository at this point in the history
cmake otherwise blows up. closes #2835.
  • Loading branch information
dankamongmen committed Jan 11, 2025
1 parent aaf1ff6 commit 092fab5
Showing 1 changed file with 18 additions and 18 deletions.
36 changes: 18 additions & 18 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -509,7 +509,7 @@ endif()
set_target_properties(
notcurses++-static PROPERTIES
OUTPUT_NAME notcurses++
)
)

set_target_properties(
notcurses++ PROPERTIES
Expand Down Expand Up @@ -572,7 +572,23 @@ target_compile_definitions(notcurses++-static
PUBLIC
${NCPP_COMPILE_DEFINITIONS_PUBLIC}
)
endif()

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() # end USE_CXX block

target_compile_options(notcurses-core
PRIVATE
Expand All @@ -594,22 +610,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 NCPP_HEADERS
CONFIGURE_DEPENDS
LIST_DIRECTORIES false
Expand Down

0 comments on commit 092fab5

Please sign in to comment.