Created
January 24, 2024 20:46
-
-
Save kmarius/288c6621b4d5c5dbacfb4876bdd1c7fc to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
--- CMakeLists.txt 2022-02-10 20:55:35.503517231 +0100 | |
+++ CMakeLists.txt.~1~ 2022-02-10 20:55:23.273461350 +0100 | |
@@ -172,9 +172,9 @@ | |
file(GLOB NCCORESRCS CONFIGURE_DEPENDS src/lib/*.c src/lib/*.cpp) | |
add_library(notcurses-core SHARED ${NCCORESRCS} ${COMPATSRC}) | |
if(${USE_STATIC}) | |
-add_library(notcurses-core-static STATIC ${NCCORESRCS}) | |
+add_library(notcurses-core-static STATIC ${NCCORESRCS} ${COMPATSRC}) | |
else() | |
-add_library(notcurses-core-static STATIC EXCLUDE_FROM_ALL ${NCCORESRCS}) | |
+add_library(notcurses-core-static STATIC EXCLUDE_FROM_ALL ${NCCORESRCS} ${COMPATSRC}) | |
endif() | |
# don't want these on freebsd/dragonfly/osx | |
if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux") | |
@@ -261,9 +261,9 @@ | |
file(GLOB NCSRCS CONFIGURE_DEPENDS src/media/*.c src/media/*.cpp) | |
add_library(notcurses SHARED ${NCSRCS} ${COMPATSRC}) | |
if(${USE_STATIC}) | |
-add_library(notcurses-static STATIC ${NCSRCS}) | |
+add_library(notcurses-static STATIC ${NCSRCS} ${COMPATSRC}) | |
else() | |
-add_library(notcurses-static STATIC EXCLUDE_FROM_ALL ${NCSRCS}) | |
+add_library(notcurses-static STATIC EXCLUDE_FROM_ALL ${NCSRCS} ${COMPATSRC}) | |
endif() | |
set_target_properties(notcurses PROPERTIES | |
VERSION ${PROJECT_VERSION} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
--- CMakeLists.txt 2022-08-21 12:16:03.534428562 +0200 | |
+++ CMakeLists.txt.~1~ 2022-08-21 15:07:29.149471840 +0200 | |
@@ -574,12 +574,6 @@ | |
${NCPP_COMPILE_DEFINITIONS_PUBLIC} | |
) | |
-file(GLOB NOTCURSES_HEADERS | |
- CONFIGURE_DEPENDS | |
- LIST_DIRECTORIES false | |
- ${PROJECT_SOURCE_DIR}/include/notcurses/*.h | |
- ${CMAKE_CURRENT_BINARY_DIR}/include/version.h) | |
- | |
file(GLOB NCPP_HEADERS | |
CONFIGURE_DEPENDS | |
LIST_DIRECTORIES false | |
@@ -591,6 +585,12 @@ | |
${PROJECT_SOURCE_DIR}/include/ncpp/internal/*.hh) | |
endif() | |
+file(GLOB NOTCURSES_HEADERS | |
+ CONFIGURE_DEPENDS | |
+ LIST_DIRECTORIES false | |
+ ${PROJECT_SOURCE_DIR}/include/notcurses/*.h | |
+ ${CMAKE_CURRENT_BINARY_DIR}/include/version.h) | |
+ | |
export(PACKAGE notcurses) | |
install(FILES ${NOTCURSES_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/notcurses) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment