Skip to content

Commit

Permalink
rename target imtui-core - > imtui
Browse files Browse the repository at this point in the history
also install imtui headers
  • Loading branch information
ggerganov committed Dec 15, 2020
1 parent 3fe1468 commit af31323
Show file tree
Hide file tree
Showing 6 changed files with 28 additions and 11 deletions.
11 changes: 11 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -99,8 +99,19 @@ if (IMTUI_STANDALONE AND IMTUI_BUILD_EXAMPLES)
endif()

include(GNUInstallDirs)

install(TARGETS imtui
EXPORT imtui
PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
)

install(TARGETS imtui-ncurses
EXPORT imtui-ncurses
PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
Expand Down
2 changes: 1 addition & 1 deletion examples/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ add_library(imtui-examples-common ${IMTUI_LIBRARY_TYPE}
)

target_link_libraries(imtui-examples-common PRIVATE
imtui-core
imtui
)

if (EMSCRIPTEN)
Expand Down
2 changes: 1 addition & 1 deletion examples/emscripten0/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ target_include_directories(${TARGET} PRIVATE
)

target_link_libraries(${TARGET} PRIVATE
imtui-core
imtui
imtui-examples-common
imtui-emscripten
)
Expand Down
2 changes: 1 addition & 1 deletion examples/hnterm/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ if (EMSCRIPTEN)
)

target_link_libraries(${TARGET} PRIVATE
imtui-core
imtui
imtui-examples-common
imtui-emscripten
)
Expand Down
18 changes: 11 additions & 7 deletions src/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,34 +1,38 @@
# core

add_library(imtui-core ${IMTUI_LIBRARY_TYPE}
add_library(imtui ${IMTUI_LIBRARY_TYPE}
imtui-impl-text.cpp
)

target_include_directories(imtui-core PUBLIC
target_include_directories(imtui PUBLIC
../include
)

target_link_libraries(imtui-core PUBLIC
target_link_libraries(imtui PUBLIC
imgui-for-imtui
)

target_link_libraries(imtui-core PRIVATE
target_link_libraries(imtui PRIVATE
${CMAKE_DL_LIBS}
)

set_target_properties(imtui PROPERTIES PUBLIC_HEADER "include/imtui/imtui.h;include/imtui/imtui-impl-text.h")

# ncurses

if (IMTUI_SUPPORT_NCURSES)
add_library(imtui-ncurses ${IMTUI_LIBRARY_TYPE}
imtui-impl-ncurses.cpp
)

target_include_directories(imtui-core PUBLIC
target_include_directories(imtui-ncurses PRIVATE
${CURSES_INCLUDE_DIR}
)

set_target_properties(imtui-ncurses PROPERTIES PUBLIC_HEADER "include/imtui/imtui-impl-ncurses.h")

target_link_libraries(imtui-ncurses PUBLIC
imtui-core
imtui
${CURSES_LIBRARIES}
)
endif()
Expand All @@ -41,6 +45,6 @@ if (EMSCRIPTEN)
)

target_link_libraries(imtui-emscripten PUBLIC
imtui-core
imtui
)
endif()
4 changes: 3 additions & 1 deletion third-party/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ else (APPLE)
unset(ADDITIONAL_LIBRARIES)
endif (APPLE)

add_library(imgui-for-imtui ${IMTUI_LIBRARY_TYPE}
add_library(imgui-for-imtui STATIC
imgui/imgui/imgui.cpp
imgui/imgui/imgui_draw.cpp
imgui/imgui/imgui_demo.cpp
Expand All @@ -30,3 +30,5 @@ target_include_directories(imgui-for-imtui PRIVATE
target_link_libraries(imgui-for-imtui PRIVATE
${ADDITIONAL_LIBRARIES}
)

set_property(TARGET imgui-for-imtui PROPERTY POSITION_INDEPENDENT_CODE ON)

0 comments on commit af31323

Please sign in to comment.