diff --git a/benchmarks/CMakeLists.txt b/benchmarks/CMakeLists.txt index b42f665..2bbb2c1 100644 --- a/benchmarks/CMakeLists.txt +++ b/benchmarks/CMakeLists.txt @@ -17,7 +17,8 @@ file(GLOB COMMONS_FILES commons/*) set(COMMONS_FILES ${COMMONS_FILES}) include_directories(${CMAKE_SOURCE_DIR}/src) -include_directories(${CMAKE_BINARY_DIR}/src/gmio_core) # For cmake generated headers +include_directories(${CMAKE_BINARY_DIR}/src) # For cmake generated headers +include_directories(${CMAKE_BINARY_DIR}/src/gmio_core) link_libraries(gmio) if(CMAKE_C_COMPILER_IS_GCC_COMPATIBLE) link_libraries(m) # -lm diff --git a/benchmarks/benchmark_assimp/main.cpp b/benchmarks/benchmark_assimp/main.cpp index 4fa6555..b361ac7 100644 --- a/benchmarks/benchmark_assimp/main.cpp +++ b/benchmarks/benchmark_assimp/main.cpp @@ -22,6 +22,7 @@ #include #include +#include #include #include #include @@ -43,14 +44,12 @@ static unsigned totalTriangleCount(const aiScene* scene) return meshnum; } -GMIO_INLINE void copy_gmio_vec3f( - aiVector3D* vec3, const gmio_vec3f& coords) +GMIO_INLINE void copy_gmio_vec3f(aiVector3D* vec3, const gmio_vec3f& coords) { *vec3 = *((aiVector3D*)&coords); } -GMIO_INLINE void copy_aiVector3D( - gmio_vec3f* coords, const aiVector3D& vec3) +GMIO_INLINE void copy_aiVector3D(gmio_vec3f* coords, const aiVector3D& vec3) { *coords = *((gmio_vec3f*)&vec3); } @@ -60,10 +59,7 @@ namespace BmkAssimp { static std::string assimp_version_str() { std::stringstream ss; - ss << "Assimp v" - << aiGetVersionMajor() << '.' - << aiGetVersionMinor() - << ".?"; + ss << aiGetVersionMajor() << '.' << aiGetVersionMinor() << ".?"; return ss.str(); } @@ -346,7 +342,11 @@ int main(int argc, char** argv) { if (argc > 1) { const char* filepath = argv[1]; - std::cout << std::endl << "Input file: " << filepath << std::endl; + std::cout << std::endl + << "gmio v" << GMIO_VERSION_STR << std::endl + << "Assimp v" << BmkAssimp::assimp_version_str() << std::endl + << std::endl + << "Input file: " << filepath << std::endl; /* Declare benchmarks */ const benchmark_cmp_arg cmp_args[] = { @@ -374,8 +374,8 @@ int main(int argc, char** argv) /* Print results */ const benchmark_cmp_result_array res_array = { &cmp_res_vec.at(0), cmp_res_vec.size() }; - const std::string assimp_ver = BmkAssimp::assimp_version_str(); - const benchmark_cmp_result_header header = { "gmio", assimp_ver.c_str() }; + const benchmark_cmp_result_header header = { + "gmio", "Assimp" }; benchmark_print_results( BENCHMARK_PRINT_FORMAT_MARKDOWN, header, res_array); } diff --git a/benchmarks/benchmark_opencascade/main.cpp b/benchmarks/benchmark_opencascade/main.cpp index 0ede235..81880e2 100644 --- a/benchmarks/benchmark_opencascade/main.cpp +++ b/benchmarks/benchmark_opencascade/main.cpp @@ -19,6 +19,7 @@ #include #include +#include #include #include #include @@ -100,7 +101,11 @@ int main(int argc, char** argv) { if (argc > 1) { const char* filepath = argv[1]; - std::cout << std::endl << "Input file: " << filepath << std::endl; + std::cout << std::endl + << "gmio v" << GMIO_VERSION_STR << std::endl + << "OpenCascade v" << OCC_VERSION_COMPLETE << std::endl + << std::endl + << "Input file: " << filepath << std::endl; /* Declare benchmarks */ const benchmark_cmp_arg cmp_args[] = { @@ -128,7 +133,7 @@ int main(int argc, char** argv) const benchmark_cmp_result_array res_array = { &cmp_res_vec.at(0), cmp_res_vec.size() }; const benchmark_cmp_result_header header = { - "gmio", "OpenCascade v"OCC_VERSION_COMPLETE }; + "gmio", "OpenCascade" }; benchmark_print_results( BENCHMARK_PRINT_FORMAT_MARKDOWN, header, res_array); }