CMake: use variable hints (#60)

* CMake: use variable hints * transformer: clang-format
trailofbits · Oct 25, 2021 · 9bd595f · 9bd595f
1 parent 4cd384c
commit 9bd595f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -21,7 +21,7 @@ include_directories(${Python3_INCLUDE_DIRS})
 link_directories(${Python3_LIBRARY_DIRS})
 add_link_options(${Python3_LINK_OPTIONS})
 
-find_package(LLVM REQUIRED CONFIG)
+find_package(LLVM REQUIRED CONFIG HINTS "${LLVM_DIR}")
 message(STATUS "Found LLVM ${LLVM_PACKAGE_VERSION}")
 message(STATUS "Using LLVMConfig.cmake in: ${LLVM_DIR}")
 
@@ -34,7 +34,7 @@ include_directories(${LLVM_INCLUDE_DIRS})
 link_directories(${LLVM_LIBRARY_DIRS})
 add_definitions(${LLVM_DEFINITIONS})
 
-find_package(Clang REQUIRED CONFIG)
+find_package(Clang REQUIRED CONFIG HINTS "${Clang_DIR}")
 message(STATUS "Using ClangConfig.cmake in: ${Clang_DIR}")
 
 include_directories(${CLANG_INCLUDE_DIRS})

diff --git a/transformer/extractor.cpp b/transformer/extractor.cpp
@@ -23,7 +23,7 @@ static bool read_file_to_string(const std::string &filename,
 
 template <class Tool, class... ToolArgs>
 static void run_clang_tool(std::string &data, int is_cxx,
-                           ToolArgs &&... tool_args) {
+                           ToolArgs &&...tool_args) {
   std::vector<std::string> args{"-x"};
   if (is_cxx) {
     args.push_back("c++");