diff --git a/kernel/CMakeLists.txt b/kernel/CMakeLists.txt index 4cd76b4ff..13b3d7e43 100644 --- a/kernel/CMakeLists.txt +++ b/kernel/CMakeLists.txt @@ -89,9 +89,10 @@ yosys_core(kernel yw.cc yw.h INCLUDE_DIRS + $<$>:${CMAKE_CURRENT_SOURCE_DIR}/libs/cxxopts/include/> ${pybind11_INCLUDE_DIR} LIBRARIES - cxxopts + $<$>:cxxopts> $<${YOSYS_ENABLE_PLUGINS}:${Dlfcn_LIBRARIES}> $<${YOSYS_ENABLE_ZLIB}:PkgConfig::zlib> $<${YOSYS_ENABLE_READLINE}:PkgConfig::readline> diff --git a/kernel/driver.cc b/kernel/driver.cc index 2a4ad1295..7bb67ffea 100644 --- a/kernel/driver.cc +++ b/kernel/driver.cc @@ -21,7 +21,7 @@ #include "kernel/hashlib.h" #include "libs/sha1/sha1.h" #define CXXOPTS_VECTOR_DELIMITER '\0' -#include "libs/cxxopts/include/cxxopts.hpp" +#include #include #include diff --git a/libs/CMakeLists.txt b/libs/CMakeLists.txt index fd82239ec..4dc97df3d 100644 --- a/libs/CMakeLists.txt +++ b/libs/CMakeLists.txt @@ -1,5 +1,7 @@ add_subdirectory(bigint) -add_subdirectory(cxxopts) +if (NOT YOSYS_WITH_PKG_DEPS) + add_subdirectory(cxxopts) +endif() add_subdirectory(dlfcn-win32) add_subdirectory(ezsat) add_subdirectory(fst)