piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2024-11-14 13:27:45 -07:00
Code Issues Actions Packages Projects Releases Wiki Activity

CMakeLists: Don't dump bochs' includes into the top-level directory

Browse Source 
Instead add it to the target interface. This way, only libraries that
link in bochs will see its include directories.
This commit is contained in:
Lioncash 2018-04-08 15:34:33 -04:00
parent 9dbc760bb7
commit b9c872dbca
No known key found for this signature in database
GPG Key ID: 4E3C3CC1031BA9C7
2 changed files with 24 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
CMakeLists.txt
View File

@ -521,20 +521,21 @@ endif()
# Process externals and setup their include directories # Process externals and setup their include directories
# #
# NOTES about adding Externals: # NOTES about adding Externals:
# - add the include directory here # - If an external provides a target, or one can be introduced with find_package, consider using it.
# - If a target doesn't exist, consider introducing a target for it with add_library and adding all necessary
# includes, definitions, etc, to that target. This way, only libraries that need those attributes simply
# need to link that target in, as opposed to them being provided to every library
# (which is the case with the directory-based include_directories, add_definitions, etc)
#
# - make sure to tell cmake to link them statically or dynamically (most # - make sure to tell cmake to link them statically or dynamically (most
# should be linked statically) # should be linked statically)
# - place the CMakeLists.txt in the first-level subdirectory, e.g. # - place the CMakeLists.txt in the first-level subdirectory, e.g.
# Externals/zlib/CMakeLists.txt (that is: NOT in some Src/ subdirectory) # Externals/zlib/CMakeLists.txt (that is: NOT in some Src/ subdirectory)
# #
add_subdirectory(Externals/Bochs_disasm) add_subdirectory(Externals/Bochs_disasm)
include_directories(Externals/Bochs_disasm)
add_subdirectory(Externals/glslang)
add_subdirectory(Externals/pugixml)
add_subdirectory(Externals/cpp-optparse) add_subdirectory(Externals/cpp-optparse)
add_subdirectory(Externals/glslang)
add_subdirectory(Externals/pugixml)
if(USE_SHARED_ENET) if(USE_SHARED_ENET)
check_lib(ENET libenet enet enet/enet.h QUIET) check_lib(ENET libenet enet enet/enet.h QUIET)

20
Externals/Bochs_disasm/CMakeLists.txt vendored
View File

@ -1,10 +1,18 @@
set(SRCS dis_decode.cc add_library(bdisasm STATIC
dis_decode.cc
dis_groups.cc dis_groups.cc
resolve.cc resolve.cc
syntax.cc) syntax.cc
)
if(WIN32) if (WIN32)
set(SRCS ${SRCS} stdafx.cc) target_sources(bdisasm
endif(WIN32) PRIVATE
stdafx.cc
)
endif()
add_library(bdisasm STATIC ${SRCS}) target_include_directories(bdisasm
PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}
)