Browse Source

use modern cmake SDL2 target

fix/style
Martin Dørum 3 years ago
parent
commit
95f7ea2e56
2 changed files with 3 additions and 4 deletions
  1. 1
    2
      CMakeLists.txt
  2. 2
    2
      third-party/CMakeLists.txt

+ 1
- 2
CMakeLists.txt View File

@@ -22,7 +22,7 @@ endif()
add_compile_options(-std=c++2a -Wall -Wextra -Wpedantic -Wno-unused-parameter)
set(libraries
third-party imgui fmt cpptoml msgpack
SDL2 SDL2_image dl z)
SDL2::SDL2 SDL2_image dl z)

if(CMAKE_BUILD_TYPE STREQUAL Sanitize OR CMAKE_BUILD_TYPE STREQUAL "")
message(STATUS "Build mode: Sanitize")
@@ -57,7 +57,6 @@ endif()
# Remove once Clang 9.1 or something comes out.
add_compile_options(-Wno-c99-extensions)

include_directories(${SDL2_INCLUDE_DIRS})
set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib;${CMAKE_INSTALL_PREFIX}/lib64;${CMAKE_INSTALL_PREFIX}/swan/libswan;${CMAKE_INSTALL_PREFIX}/swan/third-party")

add_subdirectory(third-party)

+ 2
- 2
third-party/CMakeLists.txt View File

@@ -23,8 +23,8 @@ add_library(imgui SHARED
${CMAKE_CURRENT_SOURCE_DIR}/imgui-plot/src/imgui_plot.cpp)
target_include_directories(imgui SYSTEM PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}/imgui
${CMAKE_CURRENT_SOURCE_DIR}/imgui-plot/include
${SDL2_INCLUDE_DIRS})
${CMAKE_CURRENT_SOURCE_DIR}/imgui-plot/include)
target_link_libraries(imgui SDL2::SDL2)
set_target_properties(imgui PROPERTIES CXX_CLANG_TIDY "")
target_compile_options(imgui PRIVATE -Wno-sign-compare)
install(TARGETS imgui DESTINATION swan/third-party)

Loading…
Cancel
Save