Try to fix build again

This commit is contained in:
Patricia Aas 2020-11-27 19:15:41 +01:00
parent 7ef1fd0351
commit b897458537
3 changed files with 6 additions and 5 deletions

View file

@ -10,5 +10,4 @@ if (NOT EXISTS "${CMAKE_BINARY_DIR}/conan.cmake")
"${CMAKE_BINARY_DIR}/conan.cmake")
endif ()
set(CMAKE_MODULE_PATH ${CMAKE_BINARY_DIR}/pacman/lib)
add_subdirectory(pacman)

View file

@ -3,6 +3,12 @@ conan_add_remote(NAME bincrafters INDEX 1 URL https://api.bintray.com/conan/binc
conan_cmake_run(CONANFILE conanfile.py BASIC_SETUP CMAKE_TARGETS BUILD missing)
set(CMAKE_MODULE_PATH ${CMAKE_BINARY_DIR}/pacman/)
find_package(sdl2 REQUIRED)
find_package(sdl2_image REQUIRED)
include_directories(${sdl2_INCLUDE_DIRS} ${sdl2_image_INCLUDE_DIRS})
add_subdirectory(lib)
add_subdirectory(src)
add_subdirectory(test)

View file

@ -1,7 +1,3 @@
find_package(sdl2 REQUIRED)
find_package(sdl2_image REQUIRED)
include_directories(${sdl2_INCLUDE_DIRS} ${sdl2_image_INCLUDE_DIRS})
file(GLOB_RECURSE sources CONFIGURE_DEPENDS "*.cpp")
add_library(libpacman ${sources})
target_link_libraries(libpacman sdl2::sdl2 sdl2_image::sdl2_image)