diff --git a/CMakeLists.txt b/CMakeLists.txt index 667bc0e..618298f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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) diff --git a/pacman/CMakeLists.txt b/pacman/CMakeLists.txt index 320320d..7cff2a2 100644 --- a/pacman/CMakeLists.txt +++ b/pacman/CMakeLists.txt @@ -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) diff --git a/pacman/lib/CMakeLists.txt b/pacman/lib/CMakeLists.txt index ca0bcda..df5e39f 100644 --- a/pacman/lib/CMakeLists.txt +++ b/pacman/lib/CMakeLists.txt @@ -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) \ No newline at end of file