[llvm] d66f9c4 - Fix build rules for LLVM_WITH_Z3 after D95727

[Tom Stellard via llvm-commits]

On 4/3/21 3:26 AM, Bjorn Pettersson via llvm-commits wrote:
> 
> Author: Bjorn Pettersson
> Date: 2021-04-03T12:25:37+02:00
> New Revision: d66f9c4f1e83e69abf75f97cb5f8fd1dc9422357
> 
> URL: https://github.com/llvm/llvm-project/commit/d66f9c4f1e83e69abf75f97cb5f8fd1dc9422357
> DIFF: https://github.com/llvm/llvm-project/commit/d66f9c4f1e83e69abf75f97cb5f8fd1dc9422357.diff
> 
> LOG: Fix build rules for LLVM_WITH_Z3 after D95727
> 
> Started to see build errors like this
> 
> ../lib/Support/Z3Solver.cpp:19:10: fatal error: 'z3.h' file not found
> #include <z3.h>
>           ^~~~~~
> 1 error generated.
> 
> after commit 43ceb74eb1a5801662419fb66a6bf0d5414f1ec5.
> 

I'm going to revert this commit.  I'm not sure it is correct, and there are
still issues with 43ceb74eb1a5801662419fb66a6bf0d5414f1ec5, so I need to revert
that one too.

Can you send me the CMake arguments that you were using that uncovered the
bug with 43ceb74eb1a5801662419fb66a6bf0d5414f1ec5?

-Tom

> The -isystem path to the Z3_INCLUDE_DIR wen't missing in the compile
> commands. No idea why target_include_directories stopped working with
> that commit, but using include_directories seem to work better.
> 
> Added:
>      
> 
> Modified:
>      llvm/lib/Support/CMakeLists.txt
> 
> Removed:
>      
> 
> 
> ################################################################################
> diff  --git a/llvm/lib/Support/CMakeLists.txt b/llvm/lib/Support/CMakeLists.txt
> index ddacb4feaa0f2..36919b25b0eff 100644
> --- a/llvm/lib/Support/CMakeLists.txt
> +++ b/llvm/lib/Support/CMakeLists.txt
> @@ -274,8 +274,5 @@ if(LLVM_INTEGRATED_CRT_ALLOC)
>   endif()
>   
>   if(LLVM_WITH_Z3)
> -  target_include_directories(LLVMSupport SYSTEM
> -    PRIVATE
> -    ${Z3_INCLUDE_DIR}
> -    )
> +  include_directories(SYSTEM ${Z3_INCLUDE_DIR})
>   endif()
> 
> 
>          
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at lists.llvm.org
> https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits
>