Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix CMake Config for Threading Tests #120

Merged
merged 2 commits into from
Apr 14, 2022
Merged

Fix CMake Config for Threading Tests #120

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0da272c
fix config for threading tests
alexanderlinne Apr 11, 2022
8227219
Move GnuInstallDirs module
ahueck Apr 14, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion cmake/typeartToolchainOptions.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
include(CMakeDependentOption)
include(CMakePackageConfigHelpers)
include(GNUInstallDirs)
include(FeatureSummary)

find_package(LLVM CONFIG HINTS "${LLVM_DIR}" NO_DEFAULT_PATH)
Expand Down Expand Up @@ -162,6 +161,8 @@ if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
message(STATUS "Installing to (default): ${CMAKE_INSTALL_PREFIX}")
endif()

include(GNUInstallDirs)

set(TYPEART_PREFIX ${PROJECT_NAME})
set(TARGETS_EXPORT_NAME ${TYPEART_PREFIX}Targets)
set(TYPEART_INSTALL_CONFIGDIR ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME})
2 changes: 1 addition & 1 deletion test/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ function(typeart_configure_lit_site input output)
pythonize_bool(TYPEART_SOFTCOUNTERS TYPEARTPASS_SOFTCOUNTER)

pythonize_bool(OPENMP_FOUND TYPEARTPASS_OPENMP)
pythonize_bool(CMAKE_THREAD_LIBS_INIT TYPEARTPASS_THREADS)
pythonize_bool(Threads_FOUND TYPEARTPASS_THREADS)
pythonize_bool(TYPEART_DISABLE_THREAD_SAFETY TYPEARTPASS_THREAD_UNSAFE)

pythonize_bool(MPI_C_FOUND TYPEARTPASS_MPI_C)
Expand Down