0.7 dev

.travis.yml

@@ -76,12 +76,7 @@ before_script:
     - popd
 
 script:
-    - VERBOSE=1 cmake --build build
-
-after_success:
-    - pushd build
-    - GTEST_COLOR=1 ctest --verbose
-    - popd
+    - VERBOSE=1 cmake --build build && pushd build && GTEST_COLOR=1 ctest --verbose && popd
 
 notifications:
     slack:

CHANGELOG.md

@@ -0,0 +1,16 @@
+# Change Log
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](http://keepachangelog.com/)
+and this project adheres to [Semantic Versioning](http://semver.org/).
+
+## [unreleased]
+### Added
+ - Custom plugin loaders (old version supported only shared libraries).
+
+### Changed
+ - Interface and implementation separation.
+ - Changed plugin API.
+ - Fixed MinGW build.
+
+[unreleased]: https://github.com/georgievlab/CeCe-core/compare/v0.6.0...HEAD

CMake/Functions.cmake

@@ -0,0 +1,128 @@
+# ######################################################################### #
+# Georgiev Lab (c) 2015-2016                                                #
+# ######################################################################### #
+# Department of Cybernetics                                                 #
+# Faculty of Applied Sciences                                               #
+# University of West Bohemia in Pilsen                                      #
+# ######################################################################### #
+#                                                                           #
+# This file is part of CeCe.                                                #
+#                                                                           #
+# CeCe is free software: you can redistribute it and/or modify              #
+# it under the terms of the GNU General Public License as published by      #
+# the Free Software Foundation, either version 3 of the License, or         #
+# (at your option) any later version.                                       #
+#                                                                           #
+# CeCe is distributed in the hope that it will be useful,                   #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of            #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the             #
+# GNU General Public License for more details.                              #
+#                                                                           #
+# You should have received a copy of the GNU General Public License         #
+# along with CeCe.  If not, see <http://www.gnu.org/licenses/>.             #
+#                                                                           #
+# ######################################################################### #
+
+##
+## Add CeCe test.
+## NAME: Test name
+##
+function (cece_add_test NAME)
+    if (NOT CECE_TESTS_BUILD)
+        return ()
+    endif ()
+
+    set(FULLNAME "cece-${NAME}_test")
+
+    include(CMakeParseArguments)
+    cmake_parse_arguments(ARG "" "" "SOURCES;LIBRARIES" ${ARGN})
+
+    # Create executable
+    add_executable(${FULLNAME}
+        ${ARG_SOURCES}
+    )
+
+    # Properties
+    set_target_properties(${FULLNAME} PROPERTIES
+        CXX_STANDARD 11
+        CXX_EXTENSIONS Off
+        CXX_STANDARD_REQUIRED On
+    )
+
+    # Libraries
+    target_link_libraries(${FULLNAME}
+        PRIVATE cece
+        PRIVATE ${ARG_LIBRARIES}
+        PRIVATE gtest_main
+    )
+
+    if (CMAKE_COMPILER_IS_GNUCXX AND CECE_TESTS_BUILD AND CECE_COVERAGE)
+        target_compile_options(${FULLNAME} PRIVATE --coverage)
+        target_link_libraries(${FULLNAME} PRIVATE --coverage)
+    endif ()
+
+    # Register test
+    add_test(
+        NAME ${FULLNAME}
+        COMMAND ${FULLNAME}
+        WORKING_DIRECTORY $<TARGET_FILE_DIR:${FULLNAME}>
+    )
+
+    if (WIN32 OR MINGW)
+        # Windows doen't support rpath, so we need to copy the main library to the test executable
+        add_custom_command(TARGET ${FULLNAME} POST_BUILD
+            COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:cece> $<TARGET_FILE_DIR:${FULLNAME}>
+        )
+    endif ()
+endfunction ()
+
+# ######################################################################### #
+
+##
+## Initialize GIT submodule
+## PATH: Submodule path
+## [CHECK]: Path to tested file in submodule (default CMakeLists.txt)
+##
+function(cece_init_submodule PATH)
+    if (ARGC GREATER 1)
+        set(TEST_PATH "${PATH}/${ARGV1}")
+    else ()
+        set(TEST_PATH "${PATH}/CMakeLists.txt")
+    endif ()
+
+    # Check if file exists
+    if (NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${TEST_PATH}")
+        find_package(Git REQUIRED)
+        execute_process(
+            COMMAND ${GIT_EXECUTABLE} submodule update --init --recursive ${PATH}
+            WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+        )
+    endif ()
+endfunction ()
+
+# ######################################################################### #
+
+##
+## Initialize vendor submodule (in `vendor` directory).
+## PATH: Vendor submodule name
+## [CHECK]: Path to tested file in submodule (default CMakeLists.txt)
+##
+function(cece_init_vendor PATH)
+    cece_init_submodule(vendor/${PATH} ${ARGN})
+endfunction ()
+
+# ######################################################################### #
+
+##
+## Enable CCACHE for given directory.
+## DIRECTORY: Cache directory.
+##
+function (cece_enable_ccache)
+    find_program(CCACHE_FOUND ccache)
+    if (CCACHE_FOUND)
+        set_property(DIRECTORY ${DIRECTORY} PROPERTY RULE_LAUNCH_COMPILE ccache)
+        set_property(DIRECTORY ${DIRECTORY} PROPERTY RULE_LAUNCH_LINK ccache)
+    endif ()
+endfunction ()
+
+# ######################################################################### #

CMakeLists.txt

@@ -28,12 +28,16 @@ cmake_minimum_required(VERSION 3.1)
 # ######################################################################### #
 
 project(cece
-    VERSION 0.6.0
+    VERSION 0.7.0
     LANGUAGES CXX
 )
 
 # ######################################################################### #
 
+include(CMake/Functions.cmake)
+
+# ######################################################################### #
+
 # Options
 option(CECE_RENDER                  "Enable simulation rendering (vizualization support)" On)
 option(CECE_RENDER_CHECK_ERRORS     "Enable renderer errors checking." Off)
@@ -52,20 +56,19 @@ if (APPLE)
     set(MACOSX_VERSION_MIN "10.9" CACHE STRING "Minimum version of MacOS X to support")
 endif ()
 
+# Allow to enable code coverage, only for tests and GCC
+if (CMAKE_COMPILER_IS_GNUCXX AND CECE_TESTS_BUILD)
+    option(CECE_COVERAGE "Enable code coverage generation for tests" Off)
+endif ()
+
 # ######################################################################### #
 
 # Build unit tests
 if (CECE_TESTS_BUILD)
     enable_testing()
 
     # Init google test submodule
-    if (NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/vendor/googletest/CMakeLists.txt")
-        find_package(Git REQUIRED)
-        execute_process(
-            COMMAND ${GIT_EXECUTABLE} submodule update --init --recursive vendor/googletest
-            WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-        )
-    endif ()
+    cece_init_vendor(googletest)
 
     message(STATUS "Build unit tests")
     set(BUILD_GMOCK Off CACHE BOOL "" FORCE)
@@ -75,21 +78,11 @@ if (CECE_TESTS_BUILD)
     add_subdirectory(vendor/googletest)
     target_include_directories(gtest INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/vendor/googletest/include)
 
-    find_program(CCACHE_FOUND ccache)
-    if (CCACHE_FOUND)
-        set_property(DIRECTORY vendor/googletest PROPERTY RULE_LAUNCH_COMPILE ccache)
-        set_property(DIRECTORY vendor/googletest PROPERTY RULE_LAUNCH_LINK ccache)
-    endif ()
+    cece_enable_ccache(vendor/googletest)
 endif ()
 
-# Init google test submodule
-if (NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/vendor/Box2D/Box2D/CMakeLists.txt")
-    find_package(Git REQUIRED)
-    execute_process(
-        COMMAND ${GIT_EXECUTABLE} submodule update --init --recursive vendor/Box2D
-        WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-    )
-endif ()
+# Init Box2D submodule
+cece_init_vendor(Box2D Box2D/CMakeLists.txt)
 
 # Add Box2D physics library
 set(BOX2D_BUILD_EXAMPLES Off CACHE BOOL "" FORCE)
@@ -104,15 +97,47 @@ add_subdirectory(vendor/Box2D/Box2D)
 set_target_properties(Box2D PROPERTIES POSITION_INDEPENDENT_CODE On)
 target_include_directories(Box2D INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/vendor/Box2D/Box2D)
 
-find_program(CCACHE_FOUND ccache)
-if (CCACHE_FOUND)
-    set_property(DIRECTORY vendor/Box2D/Box2D PROPERTY RULE_LAUNCH_COMPILE ccache)
-    set_property(DIRECTORY vendor/Box2D/Box2D PROPERTY RULE_LAUNCH_LINK ccache)
-endif ()
+cece_enable_ccache(vendor/Box2D/Box2D)
 
 # ######################################################################### #
 
 # CeCe library
-add_subdirectory(cece)
+add_subdirectory(src)
+
+# ######################################################################### #
+
+if (CECE_TESTS_BUILD)
+    add_subdirectory(unittests)
+
+    if (CMAKE_COMPILER_IS_GNUCXX AND CECE_COVERAGE)
+        find_program(LCOV lcov)
+        find_program(GENHTML genhtml)
+
+        if (NOT LCOV)
+            message(FATAL_ERROR "lcov not found!")
+        endif ()
+
+        if (NOT GENHTML)
+            message(FATAL_ERROR "genhtml not found!")
+        endif ()
+
+        # Add custom target for gcov
+        add_custom_target(cece-coverage
+            # Cleanup lcov
+            ${LCOV} --directory . --zerocounters
+
+            # Run tests
+            COMMAND ctest
+
+            # Capturing lcov counters and generating report
+            COMMAND ${LCOV} --directory . --capture --output-file coverage0.info
+            COMMAND ${LCOV} -r coverage0.info  'vendor/*' 'unittests/*' '/usr*' --output-file coverage.info
+            COMMAND ${GENHTML} --demangle-cpp -o coverage coverage.info
+            COMMAND ${CMAKE_COMMAND} -E remove coverage0.info
+
+            WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
+        )
+    endif ()
+endif ()
 
 # ######################################################################### #

appveyor.yml

@@ -25,7 +25,7 @@
 
 os: Visual Studio 2015
 
-version: 0.6.0.{build}
+version: 0.7.0.{build}
 
 environment:
     matrix:
@@ -42,10 +42,6 @@ environment:
         - GENERATOR: MinGW Makefiles
           CECE_RENDER: Off
 
-matrix:
-    allow_failures:
-        - GENERATOR: MinGW Makefiles
-
 # Branches to build
 branches:
     except:
@@ -62,6 +58,6 @@ build_script:
     - pushd build && cmake --build . --config Release & popd
 
 test_script:
-    - pushd build && ctest --verbose & popd
+    - pushd build && ctest -C Release --verbose & popd
 
 # ######################################################################### #