diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index 9a74064..0000000 --- a/.gitmodules +++ /dev/null @@ -1,3 +0,0 @@ -[submodule "third_party/eigen"] - path = third_party/eigen - url = https://gitlab.com/libeigen/eigen.git diff --git a/CMakeLists.txt b/CMakeLists.txt index c466b15..10f632c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,7 +1,13 @@ # CMake 3.15+ for Thrust/Cub support cmake_minimum_required(VERSION 3.19 FATAL_ERROR) + +set(CMAKE_TOOLCHAIN_FILE ${CMAKE_CURRENT_SOURCE_DIR}/vcpkg/scripts/buildsystems/vcpkg.cmake CACHE STRING "Vcpkg toolchain file") + + project(MegBA VERSION 1.0.0 LANGUAGES CUDA CXX) + + set(CMAKE_CXX_STANDARD 14) set(CUDA_STANDARD 14) set(CMAKE_CXX_STANDARD_REQUIRED TRUE) @@ -41,8 +47,7 @@ option(MEGBA_ENABLE_EXAMPLE "BUILD EXAMPLES" TRUE) # CUDA find_package(CUDAToolkit REQUIRED) find_package(OpenMP REQUIRED) -set(EIGEN_BUILD_TESTING OFF) -add_subdirectory(third_party/eigen) +find_package(Eigen3 CONFIG REQUIRED) find_package(Threads REQUIRED) if (${CMAKE_CUDA_COMPILER_VERSION} GREATER_EQUAL 11.5) set(Thrust_DIR /usr/local/cuda/targets/x86_64-linux/lib/cmake/thrust/) diff --git a/third_party/eigen b/third_party/eigen deleted file mode 160000 index 3147391..0000000 --- a/third_party/eigen +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 3147391d946bb4b6c68edd901f2add6ac1f31f8c diff --git a/vcpkg b/vcpkg new file mode 160000 index 0000000..67cc167 --- /dev/null +++ b/vcpkg @@ -0,0 +1 @@ +Subproject commit 67cc1677c3bf5c23ea14b9d2416c7422fdeac492