diff options
| author | Daniel Pfeifer <daniel@pfeifer-mail.de> | 2017-08-18 20:25:20 (GMT) |
|---|---|---|
| committer | Daniel Pfeifer <daniel@pfeifer-mail.de> | 2017-08-18 20:25:20 (GMT) |
| commit | ef978c1dea9fa3f2decadd5145c643d90af40f61 (patch) | |
| tree | 9fc96d3e91fb395018f98410a17b9b37e846eb97 /Source/CursesDialog | |
| parent | 7814d75023cc7a9b656ad6a763bd92f376caa9e6 (diff) | |
| download | CMake-ef978c1dea9fa3f2decadd5145c643d90af40f61.zip CMake-ef978c1dea9fa3f2decadd5145c643d90af40f61.tar.gz CMake-ef978c1dea9fa3f2decadd5145c643d90af40f61.tar.bz2 | |
CursesDialog: use target_include_directories for cmForm
Diffstat (limited to 'Source/CursesDialog')
| -rw-r--r-- | Source/CursesDialog/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | Source/CursesDialog/form/CMakeLists.txt | 17 |
2 files changed, 10 insertions, 11 deletions
diff --git a/Source/CursesDialog/CMakeLists.txt b/Source/CursesDialog/CMakeLists.txt index c5ac1f1..6023c83 100644 --- a/Source/CursesDialog/CMakeLists.txt +++ b/Source/CursesDialog/CMakeLists.txt @@ -17,10 +17,6 @@ set( CURSES_SRCS 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}) diff --git a/Source/CursesDialog/form/CMakeLists.txt b/Source/CursesDialog/form/CMakeLists.txt index 0677043..b468f5b 100644 --- a/Source/CursesDialog/form/CMakeLists.txt +++ b/Source/CursesDialog/form/CMakeLists.txt @@ -3,12 +3,9 @@ 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") -set( FORM_SRCS +add_library(cmForm fld_arg.c fld_attr.c fld_current.c @@ -49,10 +46,16 @@ set( FORM_SRCS fty_num.c fty_regex.c ) - -include_directories(${CMAKE_FORM_SOURCE_DIR}) -add_library(cmForm ${FORM_SRCS} ) + +target_include_directories(cmForm + PUBLIC + ${CURSES_INCLUDE_PATH} + ${CMAKE_FORM_BINARY_DIR} + ${CMAKE_FORM_SOURCE_DIR} + ) + target_link_libraries(cmForm ${CURSES_LIBRARY}) + if(CURSES_EXTRA_LIBRARY) target_link_libraries(cmForm ${CURSES_EXTRA_LIBRARY}) endif() |