Skip to content

Commit

Permalink
Reorder includes to fix hidden build dependencies
Browse files Browse the repository at this point in the history
cmake/shared.cmake includes cmake/cap_def_arch.cmake which conditionally
sets cap_thread_db only if ThreadDB has been included (but does not
include it, itself).
  • Loading branch information
hainest committed Oct 14, 2019
1 parent 2211007 commit 5eea657
Showing 1 changed file with 7 additions and 8 deletions.
15 changes: 7 additions & 8 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -17,21 +17,20 @@ set(RT_BINARY_DIR ${PROJECT_BINARY_DIR}/dyninstAPI_RT)

set (CMAKE_MODULE_PATH "${DYNINST_ROOT}/cmake" "${DYNINST_ROOT}/cmake/Modules" ${CMAKE_MODULE_PATH})

# This needs to be done first to set the global compiler flags
include(shared)

# PLATFORM is set by including 'shared'
if(PLATFORM MATCHES "bgq")
message(WARNING "Support for Bluegene/Q has been deprecated and will be removed in a future release")
endif()

find_package(ThreadDB)
find_package(Threads)
include(Boost)
include(ThreadingBuildingBlocks)
include(ElfUtils)
include(LibIberty)

include(shared)

# PLATFORM is set by including 'shared'
if(PLATFORM MATCHES "bgq")
message(WARNING "Support for Bluegene/Q has been deprecated and will be removed in a future release")
endif()

configure_file(cmake/version.h.in common/h/dyninstversion.h)
include_directories(${PROJECT_BINARY_DIR})
include_directories(${PROJECT_BINARY_DIR}/common/h)
Expand Down

0 comments on commit 5eea657

Please sign in to comment.