diff --git a/3rdparty/CMakeLists.txt b/3rdparty/CMakeLists.txt index 169e80ed..5e709175 100644 --- a/3rdparty/CMakeLists.txt +++ b/3rdparty/CMakeLists.txt @@ -55,16 +55,14 @@ if(DOWNLOAD_DEPENDENCIES) URL https://github.com/isledecomp/SIEdit/archive/ae447259389f3bf8273c7e7a4844743faf7cbdb8.tar.gz URL_MD5 dee68424fde8db6d5cef3b9034a8151f ) -else() - set(libweaver_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/libweaver") + add_library(libweaver STATIC + ${libweaver_SOURCE_DIR}/lib/core.cpp + ${libweaver_SOURCE_DIR}/lib/file.cpp + ${libweaver_SOURCE_DIR}/lib/interleaf.cpp + ${libweaver_SOURCE_DIR}/lib/object.cpp + ${libweaver_SOURCE_DIR}/lib/sitypes.cpp + ) + add_Library(libweaver::libweaver ALIAS libweaver) + target_include_directories(libweaver PUBLIC ${libweaver_SOURCE_DIR}/include/libweaver) endif() -add_library(libweaver STATIC - ${libweaver_SOURCE_DIR}/lib/core.cpp - ${libweaver_SOURCE_DIR}/lib/file.cpp - ${libweaver_SOURCE_DIR}/lib/interleaf.cpp - ${libweaver_SOURCE_DIR}/lib/object.cpp - ${libweaver_SOURCE_DIR}/lib/sitypes.cpp -) -add_library(libweaver::libweaver ALIAS libweaver) -target_include_directories(libweaver PUBLIC ${libweaver_SOURCE_DIR}/lib) diff --git a/CMakeLists.txt b/CMakeLists.txt index da82ecb4..871ddfef 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -135,6 +135,8 @@ else() find_package(iniparser REQUIRED CONFIG COMPONENTS shared) target_link_libraries(Isle::iniparser INTERFACE iniparser-shared) + + find_package(libweaver REQUIRED) endif() set(CMAKE_EXPORT_COMPILE_COMMANDS ON)