8000 Merge branch 'release/1.8.4' · dehancer/dehancer-gpulib-cpp@db3a117 · GitHub
[go: up one dir, main page]
Skip to content

Commit db3a117

Browse files
dneveradnevera
committed
Merge branch 'release/1.8.4'
2 parents bb3680f + da630d1 commit db3a117

File tree

3 files changed

+20
-34
lines changed

3 files changed

+20
-34
lines changed

‎CMakeLists.txt

Lines changed: 16 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ set(GIT_TAG_dehancer_opencl_helper "develop")
1717

1818
if(NOT DEHANCER_DEBUG)
1919
set(GIT_TAG_dehancer_xmp_cpp "0.13.0")
20-
set(GIT_TAG_dehancer_maths_cpp "0.10.0")
20+
set(GIT_TAG_dehancer_maths_cpp "0.11.0")
2121
set(GIT_TAG_dehancer_opencl_helper "0.5.0")
2222
endif ()
2323

@@ -34,7 +34,7 @@ message(STATUS "PKG_CONFIG_PATH: $ENV{PKG_CONFIG_PATH}")
3434

3535
set(PROJECT_LIB dehancer_gpulib)
3636
set(DEHANCER_GPULIB_VERSION 1)
37-
project(${PROJECT_LIB} VERSION 1.8.2)
37+
project(${PROJECT_LIB} VERSION 1.8.4)
3838

3939
#
4040
#
@@ -67,6 +67,7 @@ option (DEHANCER_CONTROLLED_SINGLETON "DEHANCER_CONTROLLED_SINGLETON" OFF)
6767
option (DEHANCER_INSTALL_COMMON_DEPS "DEHANCER_INSTALL_COMMON_DEPS" ON)
6868
option (OpenCV_DIR "OpenCV Root" "/usr/local/universal")
6969
option (GTest_ROOT "GTest_ROOT" "")
70+
option (CUDA_PATH "CUDA_PATH" "")
7071

7172
set(DEHANCER_GPULIB_CPP_SOURCE ${CMAKE_CURRENT_SOURCE_DIR})
7273
set(DEHANCER_GPULIB_BINARY ${CMAKE_CURRENT_BINARY_DIR})
@@ -339,33 +340,15 @@ if (DEHANCER_GPU_CUDA)
339340
if(WIN32)
340341

341342
if (NOT CUDAToolkit_ROOT)
342-
set(CUDA_INSTALLATION_DIR "C:/Program Files/NVIDIA GPU Computing Toolkit/CUDA")
343-
344-
set(CUDA_INSTALLATION_DIR_V115 "${CUDA_INSTALLATION_DIR}/v11.5")
345-
set(CUDA_INSTALLATION_DIR_V116 "${CUDA_INSTALLATION_DIR}/v11.6")
346-
set(CUDA_INSTALLATION_DIR_V118 "${CUDA_INSTALLATION_DIR}/v11.8")
347-
set(CUDA_INSTALLATION_DIR_V121 "${CUDA_INSTALLATION_DIR}/v12.1")
348-
set(CUDA_INSTALLATION_DIR_V123 "${CUDA_INSTALLATION_DIR}/v12.3")
349-
set(CUDA_INSTALLATION_DIR_V10 "${CUDA_INSTALLATION_DIR}/v10.2")
350-
351-
if(EXISTS ${CUDA_INSTALLATION_DIR_V123})
352-
set(CUDAToolkit_ROOT ${CUDA_INSTALLATION_DIR_V123})
353-
elseif(EXISTS ${CUDA_INSTALLATION_DIR_V121})
354-
set(CUDAToolkit_ROOT ${CUDA_INSTALLATION_DIR_V121})
355-
elseif(EXISTS ${CUDA_INSTALLATION_DIR_V118})
356-
set(CUDAToolkit_ROOT ${CUDA_INSTALLATION_DIR_V118})
357-
elseif(EXISTS ${CUDA_INSTALLATION_DIR_V116})
358-
set(CUDAToolkit_ROOT ${CUDA_INSTALLATION_DIR_V116})
359-
elseif(EXISTS ${CUDA_INSTALLATION_DIR_V115})
360-
set(CUDAToolkit_ROOT ${CUDA_INSTALLATION_DIR_V115})
361-
elseif(EXISTS ${CUDA_INSTALLATION_DIR_V10})
362-
set(CUDAToolkit_ROOT ${CUDA_INSTALLATION_DIR_V10})
343+
if (CUDA_PATH)
344+
set(CUDAToolkit_ROOT ${CUDA_PATH})
363345
else()
364346
message(FATAL_ERROR "NO CUDAToolkit is found...")
365347
endif()
366348

367349
endif ()
368350

351+
message(STATUS "CUDAToolkit_ROOT: ${CUDAToolkit_ROOT}")
369352
set(MSVC_2019 "C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\Community\\VC\\Tools\\Llvm\\x64\\bin")
370353
set(MSVC_2022 "C:\\Program Files\\Microsoft Visual Studio\\2022\\Community\\VC\\Tools\\Llvm\\x64\\bin")
371354

@@ -640,15 +623,16 @@ else ()
640623
BINARY_DIR "${CMAKE_BINARY_DIR}/dehancer_xmp_cpp-build"
641624
)
642625

643-
FetchContent_GetProperties(dehancer_xmp_cpp)
644-
if(NOT dehancer_xmp_cpp_POPULATED)
645-
FetchContent_Populate(dehancer_xmp_cpp)
646-
if (DEHANCER_INSTALL_COMMON_DEPS)
647-
add_subdirectory(${dehancer_xmp_cpp_SOURCE_DIR} ${dehancer_xmp_cpp_BINARY_DIR})
648-
else()
649-
add_subdirectory(${dehancer_xmp_cpp_SOURCE_DIR} ${dehancer_xmp_cpp_BINARY_DIR} EXCLUDE_FROM_ALL)
650-
endif ()
651-
endif()
626+
FetchContent_MakeAvailable(dehancer_xmp_cpp)
627+
# FetchContent_GetProperties(dehancer_xmp_cpp)
628+
# if(NOT dehancer_xmp_cpp_POPULATED)
629+
# FetchContent_Populate(dehancer_xmp_cpp)
630+
# if (DEHANCER_INSTALL_COMMON_DEPS)
631+
# add_subdirectory(${dehancer_xmp_cpp_SOURCE_DIR} ${dehancer_xmp_cpp_BINARY_DIR})
632+
# else()
633+
# add_subdirectory(${dehancer_xmp_cpp_SOURCE_DIR} ${dehancer_xmp_cpp_BINARY_DIR} EXCLUDE_FROM_ALL)
634+
# endif ()
635+
# endif()
652636

653637
FetchContent_GetProperties(exiv2)
654638

‎CMakePresets.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@
188188

189189
"binaryDir": "${sourceDir}/build-${presetName}",
190190

191-
"toolchainFile": "C:/vcpkg/scripts/buildsystems/vcpkg.cmake",
191+
"toolchainFile": "C:/vcpkg-qt6/scripts/buildsystems/vcpkg.cmake",
192192
"environment": {
193193
"HOME": "$env{USERPROFILE}"
194194
},
@@ -199,6 +199,8 @@
199199
"CMAKE_C_COMPILER": "$env{MSVC_BIN_DIR}/clang-cl.exe",
200200
"CMAKE_CXX_COMPILER": "$env{MSVC_BIN_DIR}/clang-cl.exe",
201201

202+
"CUDA_PATH": "$penv{CUDA_PATH}",
203+
202204
"CMAKE_SYSTEM_NAME": "Windows",
203205
"CMAKE_SYSTEM_VERSION": "10.0",
204206

‎version.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
dehancer_gpulib 1.8.2
1+
dehancer_gpulib 1.8.4

0 commit comments

Comments
 (0)
0