Fix Filecheck config in CMakeLists.txt

Author: manorom

clang/tools/sotoc/CMakeLists.txt

@@ -57,22 +57,8 @@ if (SOTOC_STANDALONE_BUILD)
 ################################################################################
 
 else()
-  #set(CLANG_CONFIG_HINT ${CMAKE_BINARY_DIR}/lib/cmake/clang)
-  #set(CLANG_LIBRARY_DIRS ${CMAKE_BINARY_DIR}/lib)
-  #set(CLANG_INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/include ${CMAKE_SOURCE_DIR}/tools/clang/include )
-  #libomptarget_say("_________A__________${CLANG_INCLUDE_DIRS}")
-  #libomptarget_say("_________B__________${CLANG_LIBRARY_DIRS}")
-  #libomptarget_say("_________C__________${LLVMCONFIG_FILE}")
   add_clang_executable(${SOTOC_PROJECT_NAME} ${SOTOC_SOURCES})
 endif()
-#  include_directories(${CLANG_INCLUDE_DIRS})
-#  link_directories(${CLANG_LIBRARY_DIRS})
-#  add_definitions(${CLANG_DEFINITIONS})
-  
-#  add_definitions(
-#  -D__STDC_LIMIT_MACROS
-#  -D__STDC_CONSTANT_MACROS
-#  )
 
 set(SOTOC_DEBUG_OUTPUT OFF CACHE BOOL "Compiles sotoc with possible debug output")
 if (SOTOC_DEBUG_OUTPUT)

clang/tools/sotoc/test/CMakeLists.txt

@@ -35,6 +35,8 @@ endif()
 
 set(SOTOC_LIT_ARGS -v --no-progress-bar)
 
+set(SOTOC_FILECHECK_EXE ${LLVM_FILECHECK_EXE})
+
 add_custom_target(check-sotoc
   COMMAND ${PYTHON_EXECUTABLE} ${SOTOC_LLVM_LIT_EXECUTABLE} ${SOTOC_LIT_ARGS} ${CMAKE_CURRENT_BINARY_DIR}
     DEPENDS sotoc

clang/tools/sotoc/test/lit.site.cfg.in

@@ -6,7 +6,7 @@ config.sotoc_obj_root = '@SOTOC_OBJ_ROOT@'
 config.library_dir = "@SOTOC_LIBOMP_LIBRARY_DIR@"
 config.omp_header_directory = "@SOTOC_OMP_HEADER_DIR@"
 config.operating_system = "@CMAKE_SYSTEM_NAME@"
-config.filecheck = "@LLVM_FILECHECK_EXE@"
+config.filecheck = "@SOTOC_FILECHECK_EXE@"
 
 # Let the main config do the real work.
 lit_config.load_config(config, '@SOTOC_TEST_DIR@/lit.cfg')