mirror/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2024-11-16 23:17:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add EXCLUDE_FROM_ALL to add_subdirectory calls

Browse Source
This commit is contained in:
Florent Castelli 2018-05-02 01:10:19 +02:00 committed by Ani
parent 2bb5354fd9
commit afd55da8cb
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
CMakeLists.txt
View File

@ -34,7 +34,7 @@ set(PNG_TESTS OFF CACHE BOOL "Build tests." FORCE)
# Select the version of libpng to use, default is builtin # Select the version of libpng to use, default is builtin
if (NOT USE_SYSTEM_LIBPNG) if (NOT USE_SYSTEM_LIBPNG)
add_subdirectory( 3rdparty/libpng ) add_subdirectory(3rdparty/libpng EXCLUDE_FROM_ALL)
endif() endif()
# TODO: do real installation, including copying directory structure # TODO: do real installation, including copying directory structure
@ -42,19 +42,19 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE "${PROJECT_BINARY_DIR}/bin")
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG "${PROJECT_BINARY_DIR}/bin") set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG "${PROJECT_BINARY_DIR}/bin")
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELWITHDEBINFO "${PROJECT_BINARY_DIR}/bin") set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELWITHDEBINFO "${PROJECT_BINARY_DIR}/bin")
add_subdirectory( Vulkan ) add_subdirectory(Vulkan EXCLUDE_FROM_ALL)
add_subdirectory( rpcs3 ) add_subdirectory(rpcs3)
include_directories(3rdparty/hidapi/hidapi) include_directories(3rdparty/hidapi/hidapi)
if(APPLE) if(APPLE)
add_subdirectory(3rdparty/hidapi/mac) add_subdirectory(3rdparty/hidapi/mac EXCLUDE_FROM_ALL)
#list(APPEND LIBS hidapi) #list(APPEND LIBS hidapi)
elseif(${CMAKE_SYSTEM_NAME} STREQUAL "Linux") elseif(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
add_subdirectory(3rdparty/hidapi/linux) add_subdirectory(3rdparty/hidapi/linux EXCLUDE_FROM_ALL)
elseif(MSVC) elseif(MSVC)
add_subdirectory(3rdparty/hidapi/windows) add_subdirectory(3rdparty/hidapi/windows EXCLUDE_FROM_ALL)
else() else()
add_subdirectory(3rdparty/hidapi/libusb) add_subdirectory(3rdparty/hidapi/libusb EXCLUDE_FROM_ALL)
#list(APPEND LIBS hidapi-libusb) #list(APPEND LIBS hidapi-libusb)
endif() endif()

2
rpcs3/CMakeLists.txt
View File

@ -202,7 +202,7 @@ if(NOT WITHOUT_LLVM)
option(WITH_POLLY OFF) option(WITH_POLLY OFF)
# LLVM needs to be built out-of-tree # LLVM needs to be built out-of-tree
add_subdirectory(../llvm ../llvm_build) add_subdirectory(../llvm ../llvm_build EXCLUDE_FROM_ALL)
set(LLVM_DIR "${CMAKE_CURRENT_BINARY_DIR}/../llvm_build/lib/cmake/llvm/") set(LLVM_DIR "${CMAKE_CURRENT_BINARY_DIR}/../llvm_build/lib/cmake/llvm/")
# now tries to find LLVM again # now tries to find LLVM again