Pre-release update build scripts and README.md

Author: flexferrum

.travis.yml

@@ -37,6 +37,21 @@ matrix:
           sources: ['ubuntu-toolchain-r-test', 'llvm-toolchain-trusty-5.0']
           packages: ['cmake', 'clang-5.0', 'g++-6', 'libboost-dev']
 
+    - os: linux
+      compiler: clang
+      env: COMPILER=clang++-6.0
+      addons:
+        apt:
+          sources: ['ubuntu-toolchain-r-test', 'llvm-toolchain-trusty-5.0']
+          packages: ['cmake', 'clang-6.0', 'g++-6', 'libboost-dev']
+
+    - os: linux
+      compiler: clang
+      env: COMPILER=clang++-7.0
+      addons:
+        apt:
+          sources: ['ubuntu-toolchain-r-test', 'llvm-toolchain-trusty-5.0']
+          packages: ['cmake', 'clang-7.0', 'g++-6', 'libboost-dev']
 
 script:
   - if [[ "${COMPILER}" != "" ]]; then export CXX=${COMPILER}; fi

CMakeLists.txt

@@ -1,10 +1,8 @@
 cmake_minimum_required(VERSION 3.0)
-project(Jinja2Cpp VERSION 0.1.0)
+project(Jinja2Cpp VERSION 0.5.0)
 
 list (APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
 
-message (STATUS ">>> Build type: ${CMAKE_BUILD_TYPE}")
-
 set(GTEST_ROOT $ENV{GTEST_DIR} CACHE PATH "Path to GTest/GMock library root")
 if (NOT UNIX)
     set(BOOST_ROOT $ENV{BOOST_DIR} CACHE PATH "Path to boost library root")
@@ -25,12 +23,18 @@ if (${CMAKE_CXX_COMPILER_ID} MATCHES "Clang" OR ${CMAKE_CXX_COMPILER_ID} MATCHES
     if (NOT UNIX)
         set (EXTRA_TEST_LIBS "stdc++")
     else ()
-        set (EXTRA_TEST_LIBS "pthread")
+        include(CMakeFindDependencyMacro)
+        find_dependency(Threads)
+        set (EXTRA_TEST_LIBS "Threads::Threads")
     endif ()
 else ()
     # MSVC
     if (NOT DEFINED MSVC_RUNTIME_TYPE)
-        set (MSVC_RUNTIME_TYPE "/MD")
+        if (NOT WITH_TESTS)
+            set (MSVC_RUNTIME_TYPE "/MD")
+        else ()
+            set (MSVC_RUNTIME_TYPE "/MT")
+        endif ()
     endif ()
     if (CMAKE_BUILD_TYPE MATCHES "Debug")
         set (CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} ${MSVC_RUNTIME_TYPE}d")
@@ -46,11 +50,8 @@ endif()
 if(NOT "${BOOST_ROOT}" STREQUAL "")
     list (APPEND CMAKE_PREFIX_PATH ${BOOST_ROOT})
     set (Boost_DIR ${BOOST_ROOT})
-    message(STATUS "BOOST library search path: ${Boost_DIR}")
 endif()
 
-message (STATUS "Thirdparty to build: ${THIRDPARTY_TARGETS}")
-message (STATUS ">>> Thirdparty build flags: ${CMAKE_CXX_FLAGS}")
 make_directory (${CMAKE_CURRENT_BINARY_DIR}/thirdparty)
 execute_process (
     COMMAND ${CMAKE_COMMAND} -G "${CMAKE_GENERATOR}" -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER} -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER} -DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS} ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty
@@ -74,8 +75,6 @@ if("${GTEST_ROOT}" STREQUAL "" AND WITH_TESTS)
     set (GTEST_ROOT ${CMAKE_CURRENT_BINARY_DIR}/thirdparty/gtest/install)
 endif ()
 
-message (STATUS "### GTEST_ROOT = ${GTEST_ROOT}")
-
 if(NOT "${GTEST_ROOT}" STREQUAL "" AND WITH_TESTS)
     list (APPEND CMAKE_PREFIX_PATH ${GTEST_ROOT})
     set (Gtest_DIR ${GTEST_ROOT})
@@ -86,12 +85,6 @@ if(NOT "${GTEST_ROOT}" STREQUAL "" AND WITH_TESTS)
         find_package(GTest)
     endif ()
 endif()
-message (STATUS "### GTEST_DIR = ${Gtest_DIR}")
-message (STATUS "### GTEST_INCLUDE_DIRS = ${GTEST_INCLUDE_DIRS}")
-message (STATUS "### GTEST_BOTH_LIBRARIES = ${GTEST_BOTH_LIBRARIES}")
-message (STATUS "### GTEST_LIBRARIES = ${GTEST_LIBRARIES}")
-message (STATUS "### GTEST_MAIN_LIBRARIES = ${GTEST_MAIN_LIBRARIES}")
-
 
 find_package(Boost)
 
@@ -108,10 +101,6 @@ set (LIB_TARGET_NAME jinja2cpp)
 CollectSources(Sources Headers ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/src)
 CollectSources(PublicSources PublicHeaders ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include)
 
-message (STATUS ">>>### Jinja2 CMAKE_CXX_FLAGS: ${CMAKE_CXX_FLAGS}")
-message (STATUS ">>>### Jinja2 CMAKE_CXX_FLAGS_RELEASE: ${CMAKE_CXX_FLAGS_RELEASE}")
-message (STATUS ">>>### Jinja2 CMAKE_CXX_FLAGS_DEBUG: ${CMAKE_CXX_FLAGS_DEBUG}")
-
 add_library(${LIB_TARGET_NAME} ${LIBRARY_TYPE}
     ${Sources}
     ${Headers}
@@ -133,6 +122,6 @@ install(TARGETS ${LIB_TARGET_NAME}
         ARCHIVE DESTINATION lib/static)
 
 install (DIRECTORY include/ DESTINATION include)
-install (DIRECTORY cmake/public DESTINATION cmake)
+install (FILES cmake/public/FindJinja2Cpp.cmake DESTINATION cmake)
 
 add_test(NAME jinja2cpp_tests COMMAND jinja2cpp_tests)

README.md

@@ -184,6 +184,13 @@ In order to compile Jinja2Cpp you need:
 > ctest -C Release
 ```
 
+## Additional CMake build flags
+You can define (via -D command line CMake option) the following build flags:
+
+* **WITH_TESTS** (default TRUE) - build or not Jinja2Cpp tests.
+* **MSVC_RUNTIME_TYPE** (default /MD) - MSVC runtime type to link with (if you use Microsoft Visual Studio compiler).
+* **LIBRARY_TYPE** Could be STATIC (default for Windows platform) or SHARED (default for Linux). Specify the type of Jinja2Cpp library to build.
+
 # Link with you projects
 Jinja2Cpp is shipped with cmake finder script. So you can:
 
@@ -201,12 +208,23 @@ find_package(Jinja2Cpp)
 ```cmake
 #...
 include_directories(
+    #...
     ${JINJA2CPP_INCLUDE_DIR}
     )
 
 target_link_libraries(YourTarget
+    #...
     ${JINJA2CPP_LIBRARY}
     )
 #...
 ```
 
+or just link with Jinja2Cpp target:
+```cmake
+#...
+target_link_libraries(YourTarget
+    #...
+    Jinja2Cpp
+    )
+#...
+```

appveyor.yml

@@ -1,24 +1,22 @@
-version: '{build}'
+version: 0.5.'{build}'
 
 os:
   - Visual Studio 2015
   - Visual Studio 2017
 
 environment:
   matrix:
-  - additional_flags: ""
-#  - additional_flags: "/std:c++latest /utf-8"
+    - PLATFORM: x64
+    - PLATFORM: x86
 
 matrix:
-  exclude:
-    - additional_flags: "/permissive- /std:c++latest /utf-8"
-      os: Visual Studio 2015
+  fast_finish: true
 
 init:
-  - if "%APPVEYOR_BUILD_WORKER_IMAGE%"=="Visual Studio 2017" call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars32.bat"
-#  - if "%APPVEYOR_BUILD_WORKER_IMAGE%"=="Visual Studio 2017" if "%PLATFORM%"=="x64" call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars64.bat"
-  - if "%APPVEYOR_BUILD_WORKER_IMAGE%"=="Visual Studio 2015" call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86
-#  - if "%APPVEYOR_BUILD_WORKER_IMAGE%"=="Visual Studio 2015" if "%PLATFORM%"=="x64" call "C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.cmd" /x64
+  - if "%APPVEYOR_BUILD_WORKER_IMAGE%"=="Visual Studio 2017" if "%PLATFORM%"=="x86" call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars32.bat"
+  - if "%APPVEYOR_BUILD_WORKER_IMAGE%"=="Visual Studio 2017" if "%PLATFORM%"=="x64" call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars64.bat"
+  - if "%APPVEYOR_BUILD_WORKER_IMAGE%"=="Visual Studio 2015" if "%PLATFORM%"=="x86" call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86
+  - if "%APPVEYOR_BUILD_WORKER_IMAGE%"=="Visual Studio 2015" if "%PLATFORM%"=="x64" call "C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.cmd" /x64
 #  - if "%APPVEYOR_BUILD_WORKER_IMAGE%"=="Visual Studio 2015" if "%GENERATOR%"=="NMake Makefiles" if "%PLATFORM%"=="x64" call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86_amd64
 
 install:
@@ -27,9 +25,8 @@ install:
 build_script:
   - mkdir -p build && cd build
   - set BOOST_DIR=C:\Libraries\boost_1_65_1
-  - cmake .. -G "NMake Makefiles" -DCMAKE_BUILD_TYPE=Release -DMSVC_RUNTIME_TYPE="/MT"
+  - cmake .. -G "NMake Makefiles" -DCMAKE_BUILD_TYPE=Release
   - cmake --build . --target all
 
 test_script:
-# - .\jinja2cpp_tests
   - ctest -C Release -V

cmake/build_thirdparty.cmake

@@ -4,9 +4,6 @@ macro (BuildThirdparty TargetName ThirdpartySrcPath ThirdpartyOutFile)
     set (INST_DIR ${CMAKE_CURRENT_BINARY_DIR}/${TargetName}/install)
 
     make_directory (${BUILD_DIR})
-    message (STATUS '${ThirdpartySrcPath}')
-    message (STATUS ">>> Thirdparty build type: ${CMAKE_BUILD_TYPE}")
-    message (STATUS ">>> Thirdparty build type: ${CMAKE_CXX_FLAGS}")
 
     add_custom_command (
         OUTPUT ${BUILD_DIR}/CMakeCache.txt

cmake/public/FindJinja2Cpp.cmake

@@ -20,3 +20,14 @@ _Jinja2Cpp_Find_Library(JINJA2CPP_LIBRARY jinja2cpp)
 
 include(FindPackageHandleStandardArgs)
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(JINJA2CPP DEFAULT_MSG JINJA2CPP_LIBRARY JINJA2CPP_INCLUDE_DIR)
+
+if (JINJA2CPP_FOUND)
+    if (NOT TARGET Jinja2Cpp)
+        add_library(Jinja2Cpp UNKNOWN IMPORTED)
+        set_target_properties(Jinja2Cpp PROPERTIES
+                        INTERFACE_INCLUDE_DIRECTORIES "${JINJA2CPP_INCLUDE_DIR}")
+        set_target_properties(Jinja2Cpp PROPERTIES
+            IMPORTED_LINK_INTERFACE_LANGUAGES "CXX"
+            IMPORTED_LOCATION "${JINJA2CPP_LIBRARY}")
+    endif ()
+endif ()