diff --git a/CMakeLists.txt b/CMakeLists.txt index dd2317cca..f7ebed370 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -103,6 +103,7 @@ OPTION ( BUILD_DOCS OFF ) +# Use subset of Windows.h if (WIN32) ADD_DEFINITIONS( -DWIN32_LEAN_AND_MEAN ) endif() @@ -203,7 +204,6 @@ IF( UNIX ) INCLUDE(GNUInstallDirs) ENDIF( UNIX ) - # Grouped compiler settings IF ((CMAKE_C_COMPILER_ID MATCHES "GNU") AND NOT CMAKE_COMPILER_IS_MINGW) # hide all not-exported symbols diff --git a/code/CMakeLists.txt b/code/CMakeLists.txt index 57f18f8d5..30a1490b2 100644 --- a/code/CMakeLists.txt +++ b/code/CMakeLists.txt @@ -951,8 +951,8 @@ if (APPLE) "../${HEADER_PATH}/Compiler" assimp.framework/Headers/Compiler COMMENT "Copying public ./Compiler/ header files to framework bundle's Headers/Compiler/") - endif(BUILD_FRAMEWORK) -endif(APPLE) + ENDIF(BUILD_FRAMEWORK) +ENDIF(APPLE) # Build against external unzip, or add ../contrib/unzip so # assimp can #include "unzip.h" @@ -981,7 +981,7 @@ if (ASSIMP_ANDROID_JNIIOSYSTEM) INSTALL(FILES ${HEADER_PATH}/${ASSIMP_ANDROID_JNIIOSYSTEM_PATH}/AndroidJNIIOSystem.h DESTINATION ${ASSIMP_INCLUDE_INSTALL_DIR} COMPONENT assimp-dev) -endif(ASSIMP_ANDROID_JNIIOSYSTEM) +ENDIF(ASSIMP_ANDROID_JNIIOSYSTEM) if(MSVC AND ASSIMP_INSTALL_PDB) IF(CMAKE_GENERATOR MATCHES "^Visual Studio") @@ -1003,7 +1003,7 @@ if(MSVC AND ASSIMP_INSTALL_PDB) CONFIGURATIONS RelWithDebInfo ) ENDIF() -endif () +ENDIF () if (ASSIMP_COVERALLS) include(Coveralls) @@ -1015,4 +1015,4 @@ if (ASSIMP_COVERALLS) "${COVERAGE_SRCS}" # The source files. ON # If we should upload. "${PROJECT_SOURCE_DIR}/cmake-modules/") # (Optional) Alternate project cmake module path. -endif() +ENDIF() diff --git a/code/Version.cpp b/code/Version.cpp index fe9a2fdaa..eb4cab417 100644 --- a/code/Version.cpp +++ b/code/Version.cpp @@ -111,6 +111,10 @@ ASSIMP_API unsigned int aiGetVersionRevision() { return GitVersion; } +ASSIMP_API const char *aiGetBranchName() { + return GitBranch; +} + // ------------------------------------------------------------------------------------------------ ASSIMP_API aiScene::aiScene() : mFlags(0) diff --git a/include/assimp/version.h b/include/assimp/version.h index d1821fa2b..20ece7fa0 100644 --- a/include/assimp/version.h +++ b/include/assimp/version.h @@ -82,6 +82,12 @@ ASSIMP_API unsigned int aiGetVersionMajor (void); */ ASSIMP_API unsigned int aiGetVersionRevision (void); +// --------------------------------------------------------------------------- +/** @brief Returns the branchname of the Assimp runtime. + * @return The current branch name. + */ +ASSIMP_API const char *aiGetBranchName(); + //! Assimp was compiled as a shared object (Windows: DLL) #define ASSIMP_CFLAGS_SHARED 0x1 //! Assimp was compiled against STLport diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 741da9534..a1bb5fd35 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -38,9 +38,6 @@ #---------------------------------------------------------------------- cmake_minimum_required( VERSION 2.6 ) -include( CTest ) -enable_testing() - INCLUDE_DIRECTORIES( ../contrib/gtest/include ../contrib/gtest/ diff --git a/test/unit/utVersion.cpp b/test/unit/utVersion.cpp index a424a27cf..af16211a1 100644 --- a/test/unit/utVersion.cpp +++ b/test/unit/utVersion.cpp @@ -69,3 +69,8 @@ TEST_F( utVersion, aiGetVersionRevisionTest ) { EXPECT_NE( aiGetVersionRevision(), 0U ); } +TEST_F( utVersion, aiGetBranchNameTest ) { + EXPECT_NE( nullptr, aiGetBranchName() ); +} + +