Index: openmp/CMakeLists.txt =================================================================== --- openmp/CMakeLists.txt +++ openmp/CMakeLists.txt @@ -87,9 +87,6 @@ # to enable time profiling support in the OpenMP runtime. add_subdirectory(runtime) -# Build libompd.so -add_subdirectory(libompd) - if (OPENMP_ENABLE_LIBOMPTARGET) # Check that the library can actually be built. if (APPLE OR WIN32) @@ -115,6 +112,9 @@ option(OPENMP_MSVC_NAME_SCHEME "Build dll with MSVC naming scheme." OFF) +# Build libompd.so +add_subdirectory(libompd) + # Build documentation add_subdirectory(docs) Index: openmp/libompd/CMakeLists.txt =================================================================== --- openmp/libompd/CMakeLists.txt +++ openmp/libompd/CMakeLists.txt @@ -16,9 +16,6 @@ add_subdirectory(src) if(LIBOMP_OMPD_GDB_SUPPORT) add_subdirectory(gdb-plugin) - # temporarily disabled - # test/CMakeLists.txt breaks DeviceRTL in LLVM_ENABLE_PROJECTS builds. - # find_package(LLVM) is likely the source of the trouble. - # add_subdirectory(test) + add_subdirectory(test) endif() endif() Index: openmp/libompd/test/CMakeLists.txt =================================================================== --- openmp/libompd/test/CMakeLists.txt +++ openmp/libompd/test/CMakeLists.txt @@ -6,31 +6,6 @@ return() endif() -find_package(LLVM REQUIRED CONFIG) -list(APPEND CMAKE_MODULE_PATH "${LLVM_CMAKE_DIR}") -include(AddLLVM) - - -#find_program(LLVM_LIT_PATH -# NAMES llvm-lit lit -# HINTS ${LLVM_TOOLS_BINARY_DIR} -# PATHS ${LLVM_ROOT_DIR}/bin /usr/bin /usr/local/bin /opt/local/bin -# DOC "llvm-lit executable. (Workaround for AddLLVM.cmake path not being set)" -#) -#if(LLVM_LIT_PATH) -# set(LLVM_EXTERNAL_LIT ${LLVM_LIT_PATH}) -#endif() - -#find_program(FILECHECK_EXECUTABLE -# NAMES Filecheck FileCheck -# HINTS ${LLVM_TOOLS_BINARY_DIR} -# PATHS ${LLVM_ROOT_DIR}/bin /usr/bin /usr/local/bin /opt/local/bin -# DOC "Filecheck executable. (Workaround for AddLLVM.cmake path not being set)" -#) -#if(LLVM_FILECHECK_PATH) -# set(LLVM_EXTERNAL_FILECHECK ${LLVM_FILECHECK_PATH}) -#endif() - set(PYTHON_PLUGIN ${ompd_BINARY_DIR}/gdb-plugin/python-module) # Configure the lit.site.cfg.in file