Skip to content

Commit

Permalink
Skip finding Boost and CMake install
Browse files Browse the repository at this point in the history
  • Loading branch information
nickbeth committed Jul 30, 2024
1 parent a41c380 commit 993d166
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 3 deletions.
9 changes: 8 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ option(DYNARMIC_USE_LLVM "Support disassembly of jitted x86_64 code using LLVM"
option(DYNARMIC_USE_PRECOMPILED_HEADERS "Use precompiled headers" ON)
option(DYNARMIC_USE_BUNDLED_EXTERNALS "Use all bundled externals (useful when e.g. cross-compiling)" OFF)
option(DYNARMIC_WARNINGS_AS_ERRORS "Warnings as errors" ${MASTER_PROJECT})
option(DYNARMIC_INSTALL "Install Dynarmic" ON)
if (NOT DEFINED DYNARMIC_FRONTENDS)
set(DYNARMIC_FRONTENDS "A32;A64" CACHE STRING "Selects which frontends to enable")
endif()
Expand Down Expand Up @@ -140,7 +141,9 @@ if (DYNARMIC_USE_BUNDLED_EXTERNALS)
set(CMAKE_DISABLE_FIND_PACKAGE_Zydis ON)
endif()

find_package(Boost 1.57 REQUIRED)
if (NOT TARGET Boost::boost)
find_package(Boost 1.57 REQUIRED)
endif()
find_package(fmt 9 CONFIG)
find_package(mcl 0.1.12 EXACT CONFIG)
find_package(tsl-robin-map CONFIG)
Expand Down Expand Up @@ -182,6 +185,10 @@ endif()
#
# Install
#
if (NOT DYNARMIC_INSTALL)
return()
endif()

include(GNUInstallDirs)
include(CMakePackageConfigHelpers)

Expand Down
4 changes: 2 additions & 2 deletions externals/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -35,14 +35,14 @@ endif()

if (NOT TARGET fmt::fmt)
# fmtlib formatting library
set(FMT_INSTALL ON)
set(FMT_INSTALL ${DYNARMIC_INSTALL})
add_subdirectory(fmt)
endif()

# mcl

if (NOT TARGET merry::mcl)
set(MCL_INSTALL ON)
set(MCL_INSTALL ${DYNARMIC_INSTALL})
add_subdirectory(mcl)
endif()

Expand Down

0 comments on commit 993d166

Please sign in to comment.