Skip to content

Commit

Permalink
Move internal includes into base CMakeListst.txt
Browse files Browse the repository at this point in the history
This ensures that all user options and internal settings are in place
before third-party dependencies are configured.
  • Loading branch information
hainest committed Dec 22, 2022
1 parent 7994763 commit d83dcee
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 8 deletions.
10 changes: 9 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,16 @@ endif()
list(INSERT CMAKE_MODULE_PATH 0 "${PROJECT_SOURCE_DIR}/cmake"
"${PROJECT_SOURCE_DIR}/cmake/tpls" "${PROJECT_SOURCE_DIR}/cmake/Modules")

# Set the C and C++ language standards
# Handle user options first
include(DyninstOptions)

# Set up Dyninst internals
include(DyninstPlatform)
include(DyninstCapArchDef)
include(DyninstLanguageStandards)
include(DyninstWarnings)
include(DyninstVisibility)
include(DyninstOptimization)

# Find the necessary third-party libraries
find_package(Threads)
Expand Down
7 changes: 0 additions & 7 deletions cmake/DyninstLibrary.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -78,13 +78,6 @@ function(dyninst_library target)
DESTINATION "${INSTALL_CMAKE_DIR}")
endfunction()

include(DyninstPlatform)
include(DyninstCapArchDef)
include(DyninstVisibility)
include(DyninstWarnings)
include(DyninstOptions)
include(DyninstOptimization)

set(BUILD_SHARED_LIBS ON)

set(INSTALL_BIN_DIR
Expand Down

0 comments on commit d83dcee

Please sign in to comment.