Skip to content

S
swiftshader
Commit da4315d2 by Antonio Maiorano
Options

CMake: use directory variables consistently

Bug: b/145758253 Change-Id: I15f02fc3f619aac398564f4aacfd30d1dadbe5ef Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/43948 Kokoro-Result: kokoro <noreply+kokoro@google.com> Reviewed-by: 's avatarBen Clayton <bclayton@google.com> Tested-by: 's avatarAntonio Maiorano <amaiorano@google.com>
parent 47d09cbd
Showing with 33 additions and 34 deletions
CMakeLists.txt
...@@ -172,58 +172,66 @@ endif() ...@@ -172,58 +172,66 @@ endif()
set_property(GLOBAL PROPERTY USE_FOLDERS TRUE) set_property(GLOBAL PROPERTY USE_FOLDERS TRUE)
########################################################### ###########################################################
# Directories
###########################################################
set(SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/src)
set(THIRD_PARTY_DIR ${CMAKE_CURRENT_SOURCE_DIR}/third_party)
set(TESTS_DIR ${CMAKE_CURRENT_SOURCE_DIR}/tests)
###########################################################
# Initialize submodules # Initialize submodules
########################################################### ###########################################################
if (SWIFTSHADER_BUILD_TESTS) if (SWIFTSHADER_BUILD_TESTS)
if (NOT TARGET gtest) if (NOT TARGET gtest)
if(NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/third_party/googletest/.git) if(NOT EXISTS ${THIRD_PARTY_DIR}/googletest/.git)
message(WARNING " message(WARNING "
third_party/googletest submodule missing. googletest submodule missing.
Running 'git submodule update --init' to download it: Running 'git submodule update --init' to download it:
") ")
execute_process(COMMAND git submodule update --init ${CMAKE_CURRENT_SOURCE_DIR}/third_party/googletest) execute_process(COMMAND git submodule update --init ${THIRD_PARTY_DIR}/googletest)
endif() endif()
endif() endif()
endif() endif()
if(SWIFTSHADER_BUILD_BENCHMARKS) if(SWIFTSHADER_BUILD_BENCHMARKS)
if (NOT TARGET benchmark::benchmark) if (NOT TARGET benchmark::benchmark)
if(NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/third_party/benchmark/.git) if(NOT EXISTS ${THIRD_PARTY_DIR}/benchmark/.git)
message(WARNING " message(WARNING "
third_party/benchmark submodule missing. benchmark submodule missing.
Running 'git submodule update --init' to download it: Running 'git submodule update --init' to download it:
") ")
execute_process(COMMAND git submodule update --init ${CMAKE_CURRENT_SOURCE_DIR}/third_party/benchmark) execute_process(COMMAND git submodule update --init ${THIRD_PARTY_DIR}/benchmark)
endif() endif()
endif() endif()
endif(SWIFTSHADER_BUILD_BENCHMARKS) endif(SWIFTSHADER_BUILD_BENCHMARKS)
if (NOT TARGET libbacktrace) if (NOT TARGET libbacktrace)
if(NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/third_party/libbacktrace/src/.git) if(NOT EXISTS ${THIRD_PARTY_DIR}/libbacktrace/src/.git)
message(WARNING " message(WARNING "
third_party/libbacktrace/src submodule missing. libbacktrace/src submodule missing.
Running 'git submodule update --init' to download it: Running 'git submodule update --init' to download it:
") ")
execute_process(COMMAND git submodule update --init ${CMAKE_CURRENT_SOURCE_DIR}/third_party/libbacktrace) execute_process(COMMAND git submodule update --init ${THIRD_PARTY_DIR}/libbacktrace)
endif() endif()
endif() endif()
if(SWIFTSHADER_GET_PVR) if(SWIFTSHADER_GET_PVR)
if(NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/third_party/PowerVR_Examples/.git) if(NOT EXISTS ${THIRD_PARTY_DIR}/PowerVR_Examples/.git)
message(WARNING " message(WARNING "
third_party/PowerVR_Examples submodule missing. PowerVR_Examples submodule missing.
Running 'git submodule update --init' to download it: Running 'git submodule update --init' to download it:
") ")
execute_process(COMMAND git submodule update --init ${CMAKE_CURRENT_SOURCE_DIR}/third_party/PowerVR_Examples) execute_process(COMMAND git submodule update --init ${THIRD_PARTY_DIR}/PowerVR_Examples)
endif() endif()
set(SWIFTSHADER_GET_PVR FALSE CACHE BOOL "Check out the PowerVR submodule" FORCE) set(SWIFTSHADER_GET_PVR FALSE CACHE BOOL "Check out the PowerVR submodule" FORCE)
endif() endif()
if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/third_party/PowerVR_Examples/.git) if(EXISTS ${THIRD_PARTY_DIR}/PowerVR_Examples/.git)
set(HAVE_PVR_SUBMODULE TRUE) set(HAVE_PVR_SUBMODULE TRUE)
endif() endif()
...@@ -297,15 +305,6 @@ if(SWIFTSHADER_USE_GROUP_SOURCES) ...@@ -297,15 +305,6 @@ if(SWIFTSHADER_USE_GROUP_SOURCES)
endif() endif()
########################################################### ###########################################################
# Directories
###########################################################
set(SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/src)
set(THIRD_PARTY_DIR ${CMAKE_CURRENT_SOURCE_DIR}/third_party)
set(TESTS_DIR ${CMAKE_CURRENT_SOURCE_DIR}/tests)
set(HELLO2_DIR ${THIRD_PARTY_DIR}/PowerVR_SDK/Examples/Beginner/01_HelloAPI/OGLES2)
###########################################################
# Compile flags # Compile flags
########################################################### ###########################################################
...@@ -568,27 +567,27 @@ string(REPLACE ";" " " SWIFTSHADER_LINK_FLAGS "${SWIFTSHADER_LINK_FLAGS}") ...@@ -568,27 +567,27 @@ string(REPLACE ";" " " SWIFTSHADER_LINK_FLAGS "${SWIFTSHADER_LINK_FLAGS}")
# libbacktrace and boost # libbacktrace and boost
########################################################### ###########################################################
if(REACTOR_EMIT_DEBUG_INFO) if(REACTOR_EMIT_DEBUG_INFO)
add_subdirectory(third_party/libbacktrace EXCLUDE_FROM_ALL) add_subdirectory(${THIRD_PARTY_DIR}/libbacktrace EXCLUDE_FROM_ALL)
add_subdirectory(third_party/boost EXCLUDE_FROM_ALL) add_subdirectory(${THIRD_PARTY_DIR}/boost EXCLUDE_FROM_ALL)
endif() endif()
########################################################### ###########################################################
# LLVM # LLVM
########################################################### ###########################################################
add_subdirectory(third_party/llvm-${SWIFTSHADER_LLVM_VERSION} EXCLUDE_FROM_ALL) add_subdirectory(${THIRD_PARTY_DIR}/llvm-${SWIFTSHADER_LLVM_VERSION} EXCLUDE_FROM_ALL)
########################################################### ###########################################################
# Subzero # Subzero
########################################################### ###########################################################
add_subdirectory(third_party/llvm-subzero EXCLUDE_FROM_ALL) add_subdirectory(${THIRD_PARTY_DIR}/llvm-subzero EXCLUDE_FROM_ALL)
add_subdirectory(third_party/subzero EXCLUDE_FROM_ALL) add_subdirectory(${THIRD_PARTY_DIR}/subzero EXCLUDE_FROM_ALL)
########################################################### ###########################################################
# marl # marl
########################################################### ###########################################################
if(BUILD_MARL) if(BUILD_MARL)
set(MARL_THIRD_PARTY_DIR ${THIRD_PARTY_DIR}) set(MARL_THIRD_PARTY_DIR ${THIRD_PARTY_DIR})
add_subdirectory(third_party/marl) add_subdirectory(${THIRD_PARTY_DIR}/marl)
endif() endif()
########################################################### ###########################################################
...@@ -596,14 +595,14 @@ endif() ...@@ -596,14 +595,14 @@ endif()
########################################################### ###########################################################
if(SWIFTSHADER_BUILD_CPPDAP) if(SWIFTSHADER_BUILD_CPPDAP)
set(CPPDAP_THIRD_PARTY_DIR ${THIRD_PARTY_DIR}) set(CPPDAP_THIRD_PARTY_DIR ${THIRD_PARTY_DIR})
add_subdirectory(third_party/cppdap) add_subdirectory(${THIRD_PARTY_DIR}/cppdap)
endif() endif()
########################################################### ###########################################################
# astc-encoder # astc-encoder
########################################################### ###########################################################
if(SWIFTSHADER_ENABLE_ASTC) if(SWIFTSHADER_ENABLE_ASTC)
add_subdirectory(third_party/astc-encoder) add_subdirectory(${THIRD_PARTY_DIR}/astc-encoder)
endif() endif()
########################################################### ###########################################################
...@@ -612,7 +611,7 @@ endif() ...@@ -612,7 +611,7 @@ endif()
if(SWIFTSHADER_BUILD_TESTS) if(SWIFTSHADER_BUILD_TESTS)
# For Win32, force gtest to match our CRT (shared) # For Win32, force gtest to match our CRT (shared)
set(gtest_force_shared_crt TRUE CACHE BOOL "" FORCE) set(gtest_force_shared_crt TRUE CACHE BOOL "" FORCE)
add_subdirectory(third_party/googletest EXCLUDE_FROM_ALL) add_subdirectory(${THIRD_PARTY_DIR}/googletest EXCLUDE_FROM_ALL)
# gtest finds python, which picks python 2 first, if present. # gtest finds python, which picks python 2 first, if present.
# We need to undo this so that SPIR-V can later find python3. # We need to undo this so that SPIR-V can later find python3.
unset(PYTHON_EXECUTABLE CACHE) unset(PYTHON_EXECUTABLE CACHE)
...@@ -698,7 +697,7 @@ if(SWIFTSHADER_BUILD_VULKAN) ...@@ -698,7 +697,7 @@ if(SWIFTSHADER_BUILD_VULKAN)
# This variable is also used by SPIRV-Tools to locate SPIRV-Headers # This variable is also used by SPIRV-Tools to locate SPIRV-Headers
set(SPIRV-Headers_SOURCE_DIR "${THIRD_PARTY_DIR}/SPIRV-Headers") set(SPIRV-Headers_SOURCE_DIR "${THIRD_PARTY_DIR}/SPIRV-Headers")
set(SPIRV_SKIP_TESTS TRUE CACHE BOOL "" FORCE) set(SPIRV_SKIP_TESTS TRUE CACHE BOOL "" FORCE)
add_subdirectory(third_party/SPIRV-Tools) # Add SPIRV-Tools target add_subdirectory(${THIRD_PARTY_DIR}/SPIRV-Tools) # Add SPIRV-Tools target
endif() endif()
# Add a vk_base interface library for shared vulkan build options. # Add a vk_base interface library for shared vulkan build options.
...@@ -753,7 +752,7 @@ endif() ...@@ -753,7 +752,7 @@ endif()
if(SWIFTSHADER_BUILD_BENCHMARKS) if(SWIFTSHADER_BUILD_BENCHMARKS)
if (NOT TARGET benchmark::benchmark) if (NOT TARGET benchmark::benchmark)
set(BENCHMARK_ENABLE_TESTING FALSE CACHE BOOL FALSE FORCE) set(BENCHMARK_ENABLE_TESTING FALSE CACHE BOOL FALSE FORCE)
add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/third_party/benchmark) add_subdirectory(${THIRD_PARTY_DIR}/benchmark)
endif() endif()
add_subdirectory(${TESTS_DIR}/ReactorBenchmarks) # Add ReactorBenchmarks target add_subdirectory(${TESTS_DIR}/ReactorBenchmarks) # Add ReactorBenchmarks target
...@@ -774,7 +773,7 @@ if(HAVE_PVR_SUBMODULE AND SWIFTSHADER_BUILD_PVR) ...@@ -774,7 +773,7 @@ if(HAVE_PVR_SUBMODULE AND SWIFTSHADER_BUILD_PVR)
endif() endif()
set(PVR_BUILD_EXAMPLES TRUE CACHE BOOL "Build the PowerVR SDK Examples" FORCE) set(PVR_BUILD_EXAMPLES TRUE CACHE BOOL "Build the PowerVR SDK Examples" FORCE)
add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/third_party/PowerVR_Examples) add_subdirectory(${THIRD_PARTY_DIR}/PowerVR_Examples)
if(NOT APPLE) if(NOT APPLE)
# Copy the 'loader' library to the bin/ directory # Copy the 'loader' library to the bin/ directory
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment