diff options
| author | rtk0c <[email protected]> | 2022-06-29 10:47:12 -0700 |
|---|---|---|
| committer | rtk0c <[email protected]> | 2022-06-29 10:47:12 -0700 |
| commit | 2cf952088d375ac8b2f45b144462af0953436cff (patch) | |
| tree | d437c348cff8fa79729b8bd3367f3e7c25cd0f32 /3rdparty | |
| parent | fad6a88a13ab1f888ab25ad0aae19c1d63aa0623 (diff) | |
Convert CMake to use include directory inheritance through library targets
Diffstat (limited to '3rdparty')
| -rw-r--r-- | 3rdparty/iconfontheaders/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | 3rdparty/imgui-node-editor/CMakeLists.txt | 11 | ||||
| -rw-r--r-- | 3rdparty/imgui/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | 3rdparty/implot/CMakeLists.txt | 11 |
4 files changed, 21 insertions, 11 deletions
diff --git a/3rdparty/iconfontheaders/CMakeLists.txt b/3rdparty/iconfontheaders/CMakeLists.txt new file mode 100644 index 0000000..cd7535f --- /dev/null +++ b/3rdparty/iconfontheaders/CMakeLists.txt @@ -0,0 +1,5 @@ +add_library(icon-font-headers INTERFACE) +target_include_directories(icon-font-headers +INTERFACE + ${CMAKE_CURRENT_LIST_DIR} +) diff --git a/3rdparty/imgui-node-editor/CMakeLists.txt b/3rdparty/imgui-node-editor/CMakeLists.txt index 614b7e9..83f2915 100644 --- a/3rdparty/imgui-node-editor/CMakeLists.txt +++ b/3rdparty/imgui-node-editor/CMakeLists.txt @@ -1,10 +1,13 @@ file(GLOB IMGUI_NODE_EDITOR_SOURCES *.cpp) add_library(imgui-node-editor ${IMGUI_NODE_EDITOR_SOURCES}) -set_target_properties(imgui-node-editor PROPERTIES UNITY_BUILD OFF) -target_include_directories(imgui-node-editor PRIVATE - ${CMAKE_SOURCE_DIR}/3rdparty/imgui-node-editor - ${CMAKE_SOURCE_DIR}/3rdparty/imgui +target_link_libraries(imgui-node-editor +PUBLIC + imgui +) +target_include_directories(imgui-node-editor +PUBLIC + ${CMAKE_CURRENT_LIST_DIR} ) set_target_properties(imgui-node-editor diff --git a/3rdparty/imgui/CMakeLists.txt b/3rdparty/imgui/CMakeLists.txt index c0910d3..4bdfe9c 100644 --- a/3rdparty/imgui/CMakeLists.txt +++ b/3rdparty/imgui/CMakeLists.txt @@ -5,10 +5,9 @@ file(GLOB IMGUI_SOURCES *.cpp) # the build flags twice both in here and in core/CMakeLists.txt add_library(imgui ${IMGUI_SOURCES} ../../core/src/Model/Template/TableTemplateIterator.hpp) -set_target_properties(imgui PROPERTIES UNITY_BUILD OFF) target_include_directories(imgui -PRIVATE - ${CMAKE_SOURCE_DIR}/3rdparty/imgui +PUBLIC + ${CMAKE_CURRENT_LIST_DIR} ) set_target_properties(imgui diff --git a/3rdparty/implot/CMakeLists.txt b/3rdparty/implot/CMakeLists.txt index ee02f6a..ab6b3aa 100644 --- a/3rdparty/implot/CMakeLists.txt +++ b/3rdparty/implot/CMakeLists.txt @@ -1,10 +1,13 @@ file(GLOB IMPLOT_SOURCES *.cpp) add_library(implot ${IMPLOT_SOURCES}) -set_target_properties(implot PROPERTIES UNITY_BUILD OFF) -target_include_directories(implot PRIVATE - ${CMAKE_SOURCE_DIR}/3rdparty/implot - ${CMAKE_SOURCE_DIR}/3rdparty/imgui +target_link_libraries(implot +PUBLIC + imgui +) +target_include_directories(implot +PUBLIC + ${CMAKE_CURRENT_LIST_DIR} ) set_target_properties(implot |