Kitware/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2025-10-18 08:51:52 +08:00
Code Issues Projects Releases Wiki Activity

CursesDialog: use target_include_directories for cmForm

Browse Source
This commit is contained in:
Daniel Pfeifer
2017-08-18 22:25:20 +02:00
parent 7814d75023
commit ef978c1dea
2 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Source/CursesDialog/CMakeLists.txt
View File

@@ -17,10 +17,6 @@ set( CURSES_SRCS
CursesDialog/ccmake CursesDialog/ccmake
) )
if( NOT CMAKE_USE_SYSTEM_FORM )
include_directories(${CMake_SOURCE_DIR}/Source/CursesDialog/form
${CMake_BINARY_DIR}/Source/CursesDialog/form)
endif()
include_directories(${CURSES_INCLUDE_PATH}) include_directories(${CURSES_INCLUDE_PATH})

17
Source/CursesDialog/form/CMakeLists.txt
View File

@@ -3,12 +3,9 @@
project(CMAKE_FORM) project(CMAKE_FORM)
include_regular_expression("^.*$")
include_directories(${CURSES_INCLUDE_PATH} "${CMAKE_CURRENT_BINARY_DIR}")
configure_file(cmFormConfigure.h.in "${CMAKE_CURRENT_BINARY_DIR}/cmFormConfigure.h") configure_file(cmFormConfigure.h.in "${CMAKE_CURRENT_BINARY_DIR}/cmFormConfigure.h")
set( FORM_SRCS add_library(cmForm
fld_arg.c fld_arg.c
fld_attr.c fld_attr.c
fld_current.c fld_current.c
@@ -49,10 +46,16 @@ set( FORM_SRCS
fty_num.c fty_num.c
fty_regex.c fty_regex.c
) )
include_directories(${CMAKE_FORM_SOURCE_DIR}) target_include_directories(cmForm
add_library(cmForm ${FORM_SRCS} ) PUBLIC
${CURSES_INCLUDE_PATH}
${CMAKE_FORM_BINARY_DIR}
${CMAKE_FORM_SOURCE_DIR}
)
target_link_libraries(cmForm ${CURSES_LIBRARY}) target_link_libraries(cmForm ${CURSES_LIBRARY})
if(CURSES_EXTRA_LIBRARY) if(CURSES_EXTRA_LIBRARY)
target_link_libraries(cmForm ${CURSES_EXTRA_LIBRARY}) target_link_libraries(cmForm ${CURSES_EXTRA_LIBRARY})
endif() endif()