From f250e52d879543fe24b5de1a9f8f20e0cee054e4 Mon Sep 17 00:00:00 2001 From: Steve Leung Date: Wed, 5 Jun 2024 16:17:16 -0600 Subject: [PATCH] cmake: don't set CMAKE_C_COMPILER, as rocRAND is a CXX project --- .gitlab-ci.yml | 1 - cmake/Dependencies.cmake | 5 +---- test/cpp_wrapper/cmake/Dependencies.cmake | 5 +---- toolchain-linux.cmake | 7 ------- toolchain-windows.cmake | 1 - 5 files changed, 2 insertions(+), 17 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a8913ae7f..050f19b2a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -598,7 +598,6 @@ test:nvcc-parity: -D BUILD_SHARED_LIBS="$BUILD_SHARED_LIBS" -D BUILD_TEST=ON -D CMAKE_BUILD_TYPE=Release - -D CMAKE_C_COMPILER:FILEPATH="$ROCM_PATH/bin/clang.exe" -D CMAKE_CXX_COMPILER:FILEPATH="$ROCM_PATH/bin/clang++.exe" -D CMAKE_INSTALL_PREFIX:PATH="$CI_PROJECT_DIR/build/install" -D CMAKE_PREFIX_PATH:PATH="$ROCM_PATH/lib/cmake" diff --git a/cmake/Dependencies.cmake b/cmake/Dependencies.cmake index b2c8ab61a..09b7286ad 100644 --- a/cmake/Dependencies.cmake +++ b/cmake/Dependencies.cmake @@ -63,15 +63,12 @@ if(BUILD_TEST) if(DEFINED CMAKE_CXX_COMPILER) set(CXX_COMPILER_OPTION "-DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}") endif() - if(DEFINED CMAKE_C_COMPILER) - set(C_COMPILER_OPTION "-DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}") - endif() download_project( PROJ googletest GIT_REPOSITORY https://github.com/google/googletest.git GIT_TAG release-1.11.0 INSTALL_DIR ${GTEST_ROOT} - CMAKE_ARGS -DBUILD_GTEST=ON -DINSTALL_GTEST=ON -Dgtest_force_shared_crt=ON -DBUILD_SHARED_LIBS=OFF -DCMAKE_INSTALL_PREFIX= ${CXX_COMPILER_OPTION} ${C_COMPILER_OPTION} -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} + CMAKE_ARGS -DBUILD_GTEST=ON -DINSTALL_GTEST=ON -Dgtest_force_shared_crt=ON -DBUILD_SHARED_LIBS=OFF -DCMAKE_INSTALL_PREFIX= ${CXX_COMPILER_OPTION} -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} LOG_DOWNLOAD TRUE LOG_CONFIGURE TRUE LOG_BUILD TRUE diff --git a/test/cpp_wrapper/cmake/Dependencies.cmake b/test/cpp_wrapper/cmake/Dependencies.cmake index 1bc9e6ff2..4caa3a839 100644 --- a/test/cpp_wrapper/cmake/Dependencies.cmake +++ b/test/cpp_wrapper/cmake/Dependencies.cmake @@ -56,15 +56,12 @@ if(NOT TARGET GTest::GTest AND NOT TARGET GTest::gtest) if(DEFINED CMAKE_CXX_COMPILER) set(CXX_COMPILER_OPTION "-DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}") endif() - if(DEFINED CMAKE_C_COMPILER) - set(C_COMPILER_OPTION "-DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}") - endif() download_project( PROJ googletest GIT_REPOSITORY https://github.com/google/googletest.git GIT_TAG release-1.11.0 INSTALL_DIR ${GTEST_ROOT} - CMAKE_ARGS -DBUILD_GTEST=ON -DINSTALL_GTEST=ON -Dgtest_force_shared_crt=ON -DBUILD_SHARED_LIBS=OFF -DCMAKE_INSTALL_PREFIX= ${CXX_COMPILER_OPTION} ${C_COMPILER_OPTION} -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} + CMAKE_ARGS -DBUILD_GTEST=ON -DINSTALL_GTEST=ON -Dgtest_force_shared_crt=ON -DBUILD_SHARED_LIBS=OFF -DCMAKE_INSTALL_PREFIX= ${CXX_COMPILER_OPTION} -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} LOG_DOWNLOAD TRUE LOG_CONFIGURE TRUE LOG_BUILD TRUE diff --git a/toolchain-linux.cmake b/toolchain-linux.cmake index e01e1c443..4f06a3915 100644 --- a/toolchain-linux.cmake +++ b/toolchain-linux.cmake @@ -16,10 +16,3 @@ if (NOT DEFINED ENV{CXX}) else() set(CMAKE_CXX_COMPILER "$ENV{CXX}" CACHE PATH "Path to the C++ compiler") endif() - -if (NOT DEFINED ENV{CC}) - set(CMAKE_C_COMPILER "${rocm_bin}/amdclang" CACHE PATH "Path to the C compiler") - set(CMAKE_CXX_FLAGS "-mllvm -amdgpu-early-inline-all=true -mllvm -amdgpu-function-calls=false") -else() - set(CMAKE_C_COMPILER "$ENV{CC}" CACHE PATH "Path to the C compiler") -endif() diff --git a/toolchain-windows.cmake b/toolchain-windows.cmake index fcc13000d..060124c80 100644 --- a/toolchain-windows.cmake +++ b/toolchain-windows.cmake @@ -15,7 +15,6 @@ else() endif() set(CMAKE_CXX_COMPILER "${rocm_bin}/clang++.exe") -set(CMAKE_C_COMPILER "${rocm_bin}/clang.exe") if (NOT python) set(python "python3") # take default for windows