Fixing some compile errors for clang
This commit is contained in:
parent
d3e5b4e816
commit
a94696ea0d
|
@ -1,13 +1,32 @@
|
|||
INCLUDE( "${CMAKE_CURRENT_SOURCE_DIR}/cmake/Find_TIMER.cmake" )
|
||||
INCLUDE(CheckCCompilerFlag)
|
||||
INCLUDE(CheckCXXCompilerFlag)
|
||||
|
||||
|
||||
MACRO( CONFIGURE_LINE_COVERAGE )
|
||||
FUNCTION( CONFIGURE_LINE_COVERAGE )
|
||||
SET( COVERAGE_FLAGS )
|
||||
SET( COVERAGE_LIBS )
|
||||
IF ( ENABLE_GCOV )
|
||||
ADD_DEFINITIONS( -fprofile-arcs -ftest-coverage )
|
||||
SET( COVERAGE_LIBS -lgcov -fprofile-arcs )
|
||||
ENDIF ()
|
||||
ENDMACRO()
|
||||
SET( COVERAGE_FLAGS -DUSE_GCOV )
|
||||
SET( CMAKE_REQUIRED_FLAGS ${CMAKE_CXX_FLAGS} -fprofile-arcs -ftest-coverage )
|
||||
CHECK_CXX_SOURCE_COMPILES( "int main() { return 0;}" profile-arcs )
|
||||
IF ( profile-arcs )
|
||||
SET( COVERAGE_FLAGS "${COVERAGE_FLAGS} -fprofile-arcs -ftest-coverage" )
|
||||
SET( COVERAGE_LIBS ${COVERAGE_LIBS} -fprofile-arcs )
|
||||
ENDIF()
|
||||
SET( CMAKE_REQUIRED_FLAGS "${CMAKE_CXX_FLAGS} ${COVERAGE_FLAGS} -lgcov" )
|
||||
CHECK_CXX_SOURCE_COMPILES( "int main() { return 0;}" lgcov )
|
||||
IF ( lgcov )
|
||||
SET( COVERAGE_LIBS -lgcov ${COVERAGE_LIBS} )
|
||||
ENDIF()
|
||||
MESSAGE("Enabling coverage:")
|
||||
MESSAGE(" COVERAGE_FLAGS = ${COVERAGE_FLAGS}")
|
||||
MESSAGE(" COVERAGE_LIBS = ${COVERAGE_LIBS}")
|
||||
ADD_DEFINITIONS( ${COVERAGE_FLAGS} )
|
||||
SET( COVERAGE_FLAGS ${COVERAGE_FLAGS} PARENT_SCOPE )
|
||||
SET( COVERAGE_LIBS ${COVERAGE_LIBS} PARENT_SCOPE )
|
||||
ENDIF()
|
||||
ENDFUNCTION()
|
||||
|
||||
|
||||
# Macro to configure CUDA
|
||||
|
|
|
@ -144,7 +144,7 @@ int main(int argc, char **argv)
|
|||
for (size_t j=0; j<list.size(); j++) {
|
||||
for (size_t k=0; k<list[i].domains.size(); k++) {
|
||||
shared_ptr<IO::Mesh> mesh = IO::getMesh(".",timesteps[i],list[j],k);
|
||||
if ( mesh==NULL ) {
|
||||
if ( mesh.get()==NULL ) {
|
||||
printf("Failed to load %s\n",meshData[i].meshName.c_str());
|
||||
pass = false;
|
||||
break;
|
||||
|
@ -152,7 +152,7 @@ int main(int argc, char **argv)
|
|||
if ( meshData[j].meshName=="pointmesh" ) {
|
||||
// Check the pointmesh
|
||||
shared_ptr<IO::PointList> pmesh = IO::getPointList(mesh);
|
||||
if ( pmesh==NULL ) {
|
||||
if ( pmesh.get()==NULL ) {
|
||||
pass = false;
|
||||
break;
|
||||
}
|
||||
|
@ -165,7 +165,7 @@ int main(int argc, char **argv)
|
|||
// Check the trimesh/trilist
|
||||
shared_ptr<IO::TriMesh> mesh1 = IO::getTriMesh(mesh);
|
||||
shared_ptr<IO::TriList> mesh2 = IO::getTriList(mesh);
|
||||
if ( mesh1==NULL || mesh2==NULL ) {
|
||||
if ( mesh1.get()==NULL || mesh2.get()==NULL ) {
|
||||
pass = false;
|
||||
break;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue
Block a user