CMake: CMAKE_REQUIRED_INCLUDES everywhere #1387

This commit is contained in:
nick black 2021-03-08 08:32:11 -03:00
parent 17e92a69f9
commit c882a44ac5
2 changed files with 11 additions and 2 deletions

View File

@ -145,6 +145,7 @@ target_include_directories(notcurses-core
PRIVATE PRIVATE
include include
src src
"${CMAKE_REQUIRED_INCLUDES}"
"${PROJECT_BINARY_DIR}/include" "${PROJECT_BINARY_DIR}/include"
"${TERMINFO_INCLUDE_DIRS}" "${TERMINFO_INCLUDE_DIRS}"
"${READLINE_INCLUDE_DIRS}" "${READLINE_INCLUDE_DIRS}"
@ -153,6 +154,7 @@ target_include_directories(notcurses-core-static
PRIVATE PRIVATE
include include
src src
"${CMAKE_REQUIRED_INCLUDES}"
"${PROJECT_BINARY_DIR}/include" "${PROJECT_BINARY_DIR}/include"
"${TERMINFO_STATIC_INCLUDE_DIRS}" "${TERMINFO_STATIC_INCLUDE_DIRS}"
"${READLINE_STATIC_INCLUDE_DIRS}" "${READLINE_STATIC_INCLUDE_DIRS}"
@ -227,6 +229,7 @@ target_include_directories(notcurses
include include
src src
src/lib src/lib
"${CMAKE_REQUIRED_INCLUDES}"
"${PROJECT_BINARY_DIR}/include" "${PROJECT_BINARY_DIR}/include"
) )
target_include_directories(notcurses-static target_include_directories(notcurses-static
@ -234,6 +237,7 @@ target_include_directories(notcurses-static
include include
src src
src/lib src/lib
"${CMAKE_REQUIRED_INCLUDES}"
"${PROJECT_BINARY_DIR}/include" "${PROJECT_BINARY_DIR}/include"
) )
target_link_libraries(notcurses target_link_libraries(notcurses
@ -529,12 +533,12 @@ target_include_directories(notcurses-demo
PRIVATE PRIVATE
include include
src src
"${CMAKE_REQUIRED_INCLUDES}"
"${PROJECT_BINARY_DIR}/include" "${PROJECT_BINARY_DIR}/include"
) )
target_link_libraries(notcurses-demo target_link_libraries(notcurses-demo
PRIVATE PRIVATE
notcurses notcurses
unistring
${MATH_LIBRARIES} ${MATH_LIBRARIES}
Threads::Threads Threads::Threads
) )
@ -546,6 +550,7 @@ add_executable(notcurses-input ${INPUTSRCS})
target_include_directories(notcurses-input target_include_directories(notcurses-input
PRIVATE PRIVATE
include include
"${CMAKE_REQUIRED_INCLUDES}"
"${PROJECT_BINARY_DIR}/include" "${PROJECT_BINARY_DIR}/include"
) )
target_link_libraries(notcurses-input target_link_libraries(notcurses-input
@ -560,6 +565,7 @@ add_executable(nctetris ${TETRISSRC})
target_include_directories(nctetris target_include_directories(nctetris
PRIVATE PRIVATE
include include
"${CMAKE_REQUIRED_INCLUDES}"
"${PROJECT_BINARY_DIR}/include" "${PROJECT_BINARY_DIR}/include"
) )
target_link_libraries(nctetris target_link_libraries(nctetris
@ -574,6 +580,7 @@ add_executable(ncneofetch ${FETCHSRCS})
target_include_directories(ncneofetch target_include_directories(ncneofetch
PRIVATE PRIVATE
include include
"${CMAKE_REQUIRED_INCLUDES}"
"${PROJECT_BINARY_DIR}/include" "${PROJECT_BINARY_DIR}/include"
) )
target_link_libraries(ncneofetch target_link_libraries(ncneofetch
@ -590,6 +597,7 @@ add_executable(ncls ${LSSRC})
target_include_directories(ncls target_include_directories(ncls
PRIVATE PRIVATE
include include
"${CMAKE_REQUIRED_INCLUDES}"
"${PROJECT_BINARY_DIR}/include" "${PROJECT_BINARY_DIR}/include"
) )
tarGET_Link_libraries(ncls tarGET_Link_libraries(ncls
@ -605,6 +613,7 @@ target_include_directories(ncplayer
PRIVATE PRIVATE
include include
src src
"${CMAKE_REQUIRED_INCLUDES}"
"${PROJECT_BINARY_DIR}/include" "${PROJECT_BINARY_DIR}/include"
) )
target_link_libraries(ncplayer target_link_libraries(ncplayer
@ -624,6 +633,7 @@ target_include_directories(notcurses-tester
PRIVATE PRIVATE
include include
src src
"${CMAKE_REQUIRED_INCLUDES}"
"${PROJECT_BINARY_DIR}/include" "${PROJECT_BINARY_DIR}/include"
src/lib src/lib
) )

View File

@ -4,7 +4,6 @@
#include <unistd.h> #include <unistd.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <unictype.h>
#include "demo.h" #include "demo.h"
// show unicode blocks. a block is always a multiple of 16 codepoints. // show unicode blocks. a block is always a multiple of 16 codepoints.