Commit 2a8a6fa3 authored by Berrill, Mark's avatar Berrill, Mark
Browse files

Fixing cmake bug with CUDA by disabling requirement for C compiler (we now only require C++).

parent 677da40f

src/CMakeLists.txt

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ ENDIF () 




# Set the project name

PROJECT( RAYTRACE-MINIAPPS )

PROJECT( RAYTRACE-MINIAPPS CXX )





# Set some common paths

src/macros.cmake

+7 −3
Original line number Diff line number Diff line
@@ -342,7 +342,7 @@ ENDMACRO() 
# Macro to identify the compiler

MACRO( IDENTIFY_COMPILER )

    # SET the C/C++ compiler

    IF ( CMAKE_C_COMPILER_WORKS OR CMAKE_C_COMPILER_WORKS )

    IF ( CMAKE_C_COMPILER_WORKS OR CMAKE_CXX_COMPILER_WORKS )

        IF( USING_GCC OR CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX OR

            (${CMAKE_C_COMPILER_ID} MATCHES "GNU") OR (${CMAKE_CXX_COMPILER_ID} MATCHES "GNU") )

            SET( USING_GCC TRUE )
@@ -568,8 +568,12 @@ MACRO( SET_COMPILER_FLAGS ) 
    # Set the warnings to use

    SET_WARNINGS()

    # Test the compile flags

    IF ( CMAKE_C_COMPILER_WORKS )

        CHECK_C_COMPILER_FLAG( "${CMAKE_C_FLAGS}" CHECK_C_FLAGS )

    ENDIF()

    IF ( CMAKE_CXX_COMPILER_WORKS )

        CHECK_CXX_COMPILER_FLAG( "${CMAKE_CXX_FLAGS}" CHECK_CXX_FLAGS )

    ENDIF()

    IF ( ( NOT CHECK_C_FLAGS ) OR ( NOT CHECK_CXX_FLAGS ) )

        IF ( USING_CRAY )

            MESSAGE(WARNING "Invalid C/CXX flags detected:\n"