diff --git a/.gitignore b/.gitignore index a28581a2..449e7e9a 100644 --- a/.gitignore +++ b/.gitignore @@ -28,3 +28,5 @@ compile_commands.json external/ presubmit.yml +# IntelliJ IDEA +.idea/ diff --git a/example/CMakeLists.txt b/example/CMakeLists.txt index 767f4fad..9f21716d 100644 --- a/example/CMakeLists.txt +++ b/example/CMakeLists.txt @@ -19,7 +19,7 @@ set_target_properties(muda_example PROPERTIES CUDA_SEPARABLE_COMPILATION ON) # target_link_libraries(muda_example PRIVATE fmt::fmt-header-only) target_include_directories(muda_example PRIVATE "${PROJECT_SOURCE_DIR}/example" - "${PROJECT_SOURCE_DIR}/external") + "${PROJECT_SOURCE_DIR}/third_party") target_link_libraries(muda_example PRIVATE muda Eigen3::Eigen) source_group(TREE "${PROJECT_SOURCE_DIR}/example" PREFIX "example" FILES ${SOURCE_FILES}) source_group(TREE "${PROJECT_SOURCE_DIR}/src" PREFIX "src" FILES ${MUDA_HEADER_FILES}) diff --git a/test/eigen_test/CMakeLists.txt b/test/eigen_test/CMakeLists.txt index 3f68f249..ea278c2c 100644 --- a/test/eigen_test/CMakeLists.txt +++ b/test/eigen_test/CMakeLists.txt @@ -7,7 +7,7 @@ target_compile_features(muda_eigen_test PRIVATE cxx_std_20) set_target_properties(muda_eigen_test PROPERTIES CUDA_SEPARABLE_COMPILATION ON) target_include_directories(muda_eigen_test PRIVATE "${PROJECT_SOURCE_DIR}/test" - "${PROJECT_SOURCE_DIR}/external") + "${PROJECT_SOURCE_DIR}/third_party") target_link_libraries(muda_eigen_test PRIVATE muda Eigen3::Eigen) source_group(TREE "${PROJECT_SOURCE_DIR}/test" PREFIX "test" FILES ${SOURCE}) source_group(TREE "${PROJECT_SOURCE_DIR}/src" PREFIX "src" FILES ${MUDA_HEADER_FILES}) diff --git a/test/linear_system_test/CMakeLists.txt b/test/linear_system_test/CMakeLists.txt index f7c8e64f..bbe5fd7b 100644 --- a/test/linear_system_test/CMakeLists.txt +++ b/test/linear_system_test/CMakeLists.txt @@ -10,7 +10,7 @@ target_compile_features(muda_linear_system_test PRIVATE cxx_std_20) set_target_properties(muda_linear_system_test PROPERTIES CUDA_SEPARABLE_COMPILATION ON) target_include_directories(muda_linear_system_test PRIVATE "${PROJECT_SOURCE_DIR}/test" - "${PROJECT_SOURCE_DIR}/external") + "${PROJECT_SOURCE_DIR}/third_party") target_link_libraries(muda_linear_system_test PRIVATE muda cusparse cublas cusolver Eigen3::Eigen) source_group(TREE "${PROJECT_SOURCE_DIR}/test" PREFIX "test" FILES ${SOURCE}) source_group(TREE "${PROJECT_SOURCE_DIR}/src" PREFIX "src" FILES ${MUDA_HEADER_FILES}) diff --git a/test/spgrid_test/CMakeLists.txt b/test/spgrid_test/CMakeLists.txt index 3048418a..61e36ccb 100644 --- a/test/spgrid_test/CMakeLists.txt +++ b/test/spgrid_test/CMakeLists.txt @@ -11,7 +11,7 @@ target_compile_features(muda_spgrid_test PRIVATE cxx_std_20) set_target_properties(muda_spgrid_test PROPERTIES CUDA_SEPARABLE_COMPILATION ON) target_include_directories(muda_spgrid_test PRIVATE "${PROJECT_SOURCE_DIR}/test" - "${PROJECT_SOURCE_DIR}/external") + "${PROJECT_SOURCE_DIR}/third_party") target_link_libraries(muda_spgrid_test PRIVATE muda Eigen3::Eigen) add_test(NAME muda_spgrid_test COMMAND muda_spgrid_test) diff --git a/test/unit_test/CMakeLists.txt b/test/unit_test/CMakeLists.txt index 6f1b86bc..79fb23a6 100644 --- a/test/unit_test/CMakeLists.txt +++ b/test/unit_test/CMakeLists.txt @@ -10,7 +10,7 @@ target_compile_features(muda_unit_test PRIVATE cxx_std_20) set_target_properties(muda_unit_test PROPERTIES CUDA_SEPARABLE_COMPILATION ON) target_include_directories(muda_unit_test PRIVATE "${PROJECT_SOURCE_DIR}/test" - "${PROJECT_SOURCE_DIR}/external") + "${PROJECT_SOURCE_DIR}/third_party") target_link_libraries(muda_unit_test PRIVATE muda cusparse cublas cusolver Eigen3::Eigen) target_compile_definitions(muda_unit_test PRIVATE "-DMUDA_TEST_DATA_DIR=R\"(${PROJECT_SOURCE_DIR}/test/data)\"") source_group(TREE "${PROJECT_SOURCE_DIR}/test" PREFIX "test" FILES ${SOURCE}) diff --git a/xmake/muda_app_base.lua b/xmake/muda_app_base.lua index bbca501b..1ad2f7ff 100644 --- a/xmake/muda_app_base.lua +++ b/xmake/muda_app_base.lua @@ -11,7 +11,7 @@ function muda_app_base(kind) add_undefines("min","max") add_packages("eigen", {public = false}) set_kind("binary") - add_includedirs("external/", {public = false}) + add_includedirs("third_party/", {public = false}) add_headerfiles("src/muda/**.h","src/muda/**.inl") add_cugencodes("native")