diff options
| author | Alexey Sotkin <alexey.sotkin@intel.com> | 2018-05-08 18:31:53 +0300 |
|---|---|---|
| committer | Alexey Sotkin <alexey.sotkin@intel.com> | 2018-05-14 10:50:25 +0300 |
| commit | 76e2aa33f3e4e5be50ef32ab4add858c2926b0ff (patch) | |
| tree | 7fcdd4873def8e8aa88b90840f08949c42333ee8 | |
| parent | 05aa9959aa583c6851b4b000c0e380f5a568d9d3 (diff) | |
Allow to build LLVMSPIRV lib as static library
| -rw-r--r-- | .travis.yml | 14 | ||||
| -rw-r--r-- | lib/SPIRV/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | tools/llvm-spirv/CMakeLists.txt | 6 |
3 files changed, 19 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml index 549dd36..f44c074 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,10 +28,14 @@ env: global: - MAKEFLAGS="-j2" matrix: - - BUILD_TYPE=Release BUILD_EXTERNAL=1 MAKE_TARGETS="" MAKE_TEST_TARGET="test" - - BUILD_TYPE=Debug BUILD_EXTERNAL=1 MAKE_TARGETS="" MAKE_TEST_TARGET="test" - - BUILD_TYPE=Release BUILD_EXTERNAL=0 MAKE_TARGETS="llvm-spirv" MAKE_TEST_TARGET="check-llvm-spirv" - - BUILD_TYPE=Debug BUILD_EXTERNAL=0 MAKE_TARGETS="llvm-spirv" MAKE_TEST_TARGET="check-llvm-spirv" + - BUILD_TYPE=Release BUILD_EXTERNAL=1 SHARED_LIBS=ON MAKE_TARGETS="" MAKE_TEST_TARGET="test" + - BUILD_TYPE=Debug BUILD_EXTERNAL=1 SHARED_LIBS=ON MAKE_TARGETS="" MAKE_TEST_TARGET="test" + - BUILD_TYPE=Release BUILD_EXTERNAL=0 SHARED_LIBS=ON MAKE_TARGETS="llvm-spirv" MAKE_TEST_TARGET="check-llvm-spirv" + - BUILD_TYPE=Debug BUILD_EXTERNAL=0 SHARED_LIBS=ON MAKE_TARGETS="llvm-spirv" MAKE_TEST_TARGET="check-llvm-spirv" + - BUILD_TYPE=Release BUILD_EXTERNAL=1 SHARED_LIBS=OFF MAKE_TARGETS="" MAKE_TEST_TARGET="test" + - BUILD_TYPE=Debug BUILD_EXTERNAL=1 SHARED_LIBS=OFF MAKE_TARGETS="" MAKE_TEST_TARGET="test" + - BUILD_TYPE=Release BUILD_EXTERNAL=0 SHARED_LIBS=OFF MAKE_TARGETS="llvm-spirv" MAKE_TEST_TARGET="check-llvm-spirv" + - BUILD_TYPE=Debug BUILD_EXTERNAL=0 SHARED_LIBS=OFF MAKE_TARGETS="llvm-spirv" MAKE_TEST_TARGET="check-llvm-spirv" # some bug inside clang-5.0.0, works with 5.0.1 matrix: @@ -61,6 +65,7 @@ script: if [ $BUILD_EXTERNAL == "1" ]; then cmake .. \ -DCMAKE_BUILD_TYPE=${BUILD_TYPE} \ + -DBUILD_SHARED_LIBS=${SHARED_LIBS} \ -DLLVM_BUILD_TOOLS=ON \ -DLLVM_EXTERNAL_LIT="/usr/lib/llvm-7/build/utils/lit/lit.py" \ -DLLVM_INCLUDE_TESTS=ON \ @@ -69,6 +74,7 @@ script: else cmake ../llvm/ \ -DCMAKE_BUILD_TYPE=${BUILD_TYPE} \ + -DBUILD_SHARED_LIBS=${SHARED_LIBS} \ -DLLVM_BUILD_TOOLS=ON \ -DLLVM_BUILD_TESTS=ON \ -DLLVM_INCLUDE_TESTS=ON \ diff --git a/lib/SPIRV/CMakeLists.txt b/lib/SPIRV/CMakeLists.txt index 6fcb6ed..041452d 100644 --- a/lib/SPIRV/CMakeLists.txt +++ b/lib/SPIRV/CMakeLists.txt @@ -3,7 +3,7 @@ if(SPIRV_USE_LLVM_API) add_definitions(-D_SPIRV_LLVM_API) endif(SPIRV_USE_LLVM_API) -add_llvm_library(LLVMSPIRVLib SHARED +add_llvm_library(LLVMSPIRVLib libSPIRV/SPIRVBasicBlock.cpp libSPIRV/SPIRVDebug.cpp libSPIRV/SPIRVDecorate.cpp @@ -40,6 +40,8 @@ add_llvm_library(LLVMSPIRVLib SHARED Core Support TransformUtils + DEPENDS + intrinsics_gen ) target_include_directories(LLVMSPIRVLib diff --git a/tools/llvm-spirv/CMakeLists.txt b/tools/llvm-spirv/CMakeLists.txt index 48567ab..c619af4 100644 --- a/tools/llvm-spirv/CMakeLists.txt +++ b/tools/llvm-spirv/CMakeLists.txt @@ -1,5 +1,11 @@ set(LLVM_LINK_COMPONENTS SPIRVLib + Analysis + BitReader + BitWriter + Core + Support + TransformUtils ) add_llvm_tool(llvm-spirv |