Move over to vcpkg

- Faster builds
- Easier management of 3rdparty packages
- Huge time saving for maintenance tasks
- Simpler CMake files

Author: cmaughan

.travis.yml

@@ -2,18 +2,17 @@ language: cpp
 
 before_script:
   # Make mutils first and install it
+  - cd ..
   - git clone https://github.com/cmaughan/MUtils
   - cd MUtils
   - chmod +x prebuild.sh
-  - chmod +x m3rdparty/packages/install.sh
   - sudo ./prebuild.sh
   - mkdir build
   - cd build
   - cmake -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ ..
   - make
   - sudo make install
-  - cd ..
-  - cd ..
+  - cd $TRAVIS_BUILD_DIR
   - mkdir build
   - cd build
 

CMakeLists.txt

@@ -1,9 +1,6 @@
 cmake_minimum_required(VERSION 3.2)
 
 message(STATUS "CMakeLists: Zep")
-message(STATUS "Build Type: " ${CMAKE_BUILD_TYPE})
-
-list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/cmake)
 
 # Global Options
 option(BUILD_QT "Make Qt Library" OFF)
@@ -25,14 +22,19 @@ set(gtest_force_shared_crt ON CACHE BOOL "Always use msvcrt.dll" FORCE)
 set(CMAKE_DEBUG_POSTFIX "-debug")
 set(CMAKE_RELWITHDEBINFO_POSTFIX "-reldbg")
 
+if (BUILD_DEMOS OR BUILD_EXTENSIONS)
+if (WIN32)
+set(VCPKG_TARGET_TRIPLET x64-windows-static)
+endif()
+set(CMAKE_TOOLCHAIN_FILE ${CMAKE_CURRENT_SOURCE_DIR}/../vcpkg/scripts/buildsystems/vcpkg.cmake CACHE STRING "Vcpkg toolchain file")
+endif()
+
 project(Zep
     LANGUAGES CXX C
     VERSION 0.5.0
 )
 
-# Used Packages
-include(GNUInstallDirs)
-include(CMakePackageConfigHelpers)
+list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/cmake)
 
 # Can I remove these now?
 if (ZEP_FEATURE_CPP_FILE_SYSTEM)
@@ -51,15 +53,17 @@ set (M3RDPARTY_DIR ${CMAKE_CURRENT_LIST_DIR}/m3rdparty)
 
 configure_file(${ZEP_ROOT}/cmake/config_app.h.cmake ${CMAKE_BINARY_DIR}/config_app.h)
 
+include(GNUInstallDirs)
+
 # Set all compiler flags 
 include(cmake/all.cmake)
 
 # Functions for file copying
 include(m3rdparty/cmake/copy_files.cmake)
 
 # The main library
-add_subdirectory(extensions)
 add_subdirectory(src)
+add_subdirectory(extensions)
 add_subdirectory(tests)
 add_subdirectory(demos)
 

appveyor.yml

@@ -32,7 +32,7 @@ install:
 build_script:
   # generate build script
   - cd %APPVEYOR_BUILD_FOLDER%
-  - dir
+  - cd ..
   # create folder for an out-of-source-tree build: "c:\projects\build"
   - git clone https://github.com/cmaughan/MUtils
   - cd MUtils

cmake/all.cmake

@@ -1,40 +1,129 @@
-# Compiler flags
-if(CMAKE_COMPILER_IS_GNUCXX)
-  include(${PROJECT_SOURCE_DIR}/cmake/g++.cmake)
-elseif(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-  include(${PROJECT_SOURCE_DIR}/cmake/clang++.cmake)
-elseif(MSVC)
-  include(${PROJECT_SOURCE_DIR}/cmake/msvc.cmake)
-else()
-  message(WARNING "Unknown compiler, not setting flags")
+if(WIN32)
+add_compile_options("$<$<CONFIG:RELWITHDEBINFO>:-DTRACY_ENABLE=1 -DMT>")
+add_compile_options("$<$<CONFIG:DEBUG>:-DTRACY_ENABLE=1 -DMTd>")
+add_compile_options("$<$<CONFIG:RELEASE>:-DMT>")
+add_compile_options(-D_CRT_SECURE_NO_WARNINGS=1 -DGLM_ENABLE_EXPERIMENTAL -DGLM_LANG_STL11_FORCED -DGLM_FORCE_DEPTH_ZERO_TO_ONE -DNOMINMAX -D_SCL_SECURE_NO_WARNINGS=1 -D_CRT_NONSTDC_NO_WARNINGS=1 -D_SILENCE_EXPERIMENTAL_FILESYSTEM_DEPRECATION_WARNING -D_CRT_SECURE_NO_WARNINGS=1 -D_SILENCE_ALL_CXX17_DEPRECATION_WARNINGS -D_SILENCE_CXX17_OLD_ALLOCATOR_MEMBERS_DEPRECATION_WARNING)
 endif()
 
 # Ensure Debug Flags
 set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -D_DEBUG -DDEBUG")
 
-message(STATUS "System: ${CMAKE_SYSTEM}")
-message(STATUS "Compiler: ${CMAKE_CXX_COMPILER_ID}")
-message(STATUS "Flags: ${CMAKE_CXX_FLAGS}")
-message(STATUS "Arch: ${PROCESSOR_ARCH}")
+# ------------------------------------------------------------------------------
+# Coverage
+# ------------------------------------------------------------------------------
+if(ENABLE_COVERAGE)
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g ")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O0")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fprofile-arcs")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ftest-coverage")
+    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} --coverage")
+endif()
+
+# ------------------------------------------------------------------------------
+# Google Sanitizers
+# ------------------------------------------------------------------------------
+
+if(ENABLE_ASAN)
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O1")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fuse-ld=gold")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-omit-frame-pointer")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=address")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=leak")
+endif()
+
+if(ENABLE_USAN)
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fuse-ld=gold")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=undefined")
+endif()
+
+if(ENABLE_TSAN)
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fuse-ld=gold")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=thread")
+endif()
+
+# ------------------------------------------------------------------------------
+# Valgrind
+# ------------------------------------------------------------------------------
+
+set(MEMORYCHECK_COMMAND_OPTIONS "${MEMORYCHECK_COMMAND_OPTIONS} --leak-check=full")
+set(MEMORYCHECK_COMMAND_OPTIONS "${MEMORYCHECK_COMMAND_OPTIONS} --track-fds=yes")
+set(MEMORYCHECK_COMMAND_OPTIONS "${MEMORYCHECK_COMMAND_OPTIONS} --trace-children=yes")
+set(MEMORYCHECK_COMMAND_OPTIONS "${MEMORYCHECK_COMMAND_OPTIONS} --error-exitcode=1")
 
 # System flags
 if ("${CMAKE_SYSTEM_NAME}" STREQUAL "Windows")
     message(STATUS "TARGET_PC")
-    SET(TARGET_PC 1)
-    SET(PROJECT_CPP_FILESYSTEM 1)
-    INCLUDE(${PROJECT_SOURCE_DIR}/cmake/pc.cmake)
+    set(TARGET_PC 1)
+    
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /MP")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP")
+
+    LIST(APPEND PLATFORM_LINKLIBS
+        opengl32.lib
+        winmm.lib   # SDL - sound, etc.
+        version.lib # SDL - windows keyboard
+        imm32.lib   # SDL - windows keyboard
+    )
 endif()
 
 if("${CMAKE_SYSTEM_NAME}" STREQUAL "Darwin")
     message(STATUS "TARGET_MAC")
-    SET(TARGET_MAC 1)
-    INCLUDE(${PROJECT_SOURCE_DIR}/cmake/mac.cmake)
+    
+    find_package(OpenGL REQUIRED)
+    find_package(Threads REQUIRED)
+    find_package(BZIP2 REQUIRED)
+    find_package(ZLIB REQUIRED)
+
+    if(NOT OPENGL_FOUND)
+        message(ERROR " OPENGL not found!")
+    endif(NOT OPENGL_FOUND)
+
+    include_directories(${OpenGL_INCLUDE_DIRS})
+    link_directories(${OpenGL_LIBRARY_DIRS})
+    add_definitions(${OpenGL_DEFINITIONS})
+
+    LIST(APPEND PLATFORM_LINKLIBS
+        ${OPENGL_LIBRARY}
+        ${BZIP2_LIBRARY}
+        ${ZLIB_LIBRARY}
+        dl
+        "-framework CoreFoundation"
+        )
+
+    set(TARGET_MAC 1)
 endif()
 
 if("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux")
+    find_package(OpenGL REQUIRED)
+    if(NOT OPENGL_FOUND)
+        message(ERROR " OPENGL not found!")
+    endif(NOT OPENGL_FOUND)
+
+    set(CMAKE_THREAD_PREFER_PTHREAD TRUE)
+    set(THREADS_PREFER_PTHREAD_FLAG TRUE)
+    find_package(Threads REQUIRED)
+
+    include_directories(${OpenGL_INCLUDE_DIRS})
+    link_directories(${OpenGL_LIBRARY_DIRS})
+    add_definitions(${OpenGL_DEFINITIONS})
+
+    LIST(APPEND PLATFORM_LINKLIBS
+        dl 
+        Threads::Threads
+        ${OPENGL_LIBRARY}
+        z
+        )
+
     message(STATUS "TARGET_LINUX")
-    SET(TARGET_LINUX 1)
-    SET(PROJECT_CPP_FILESYSTEM 1)
-    INCLUDE(${PROJECT_SOURCE_DIR}/cmake/linux.cmake)
+    set(TARGET_LINUX 1)
 endif()
 
+message(STATUS "System: ${CMAKE_SYSTEM}")
+message(STATUS "Compiler: ${CMAKE_CXX_COMPILER_ID}")
+message(STATUS "Flags: ${CMAKE_CXX_FLAGS}")
+message(STATUS "Debug Flags: ${CMAKE_CXX_FLAGS_DEBUG}")
+message(STATUS "Release Flags: ${CMAKE_CXX_FLAGS_RELEASE}")
+message(STATUS "RelWithDebInfo Flags: ${CMAKE_CXX_FLAGS_RELWITHDEBINFO}")
+message(STATUS "Arch: ${PROCESSOR_ARCH}")
+

cmake/clang++.cmake

@@ -0,0 +1,10 @@
+#!/bin/sh
+
+mkdir build
+cd build
+if [ "$1" != "" ] ; then
+cmake -G "Unix Makefiles" -DBUILD_QT=OFF -DBUILD_IMGUI=ON -DCMAKE_BUILD_TYPE=$1 ../
+else
+cmake -G "Unix Makefiles" -DBUILD_QT=OFF -DBUILD_IMGUI=ON -DCMAKE_BUILD_TYPE=Release ../
+fi
+cd ../

config_imgui.sh

@@ -7,6 +7,15 @@ set(IDENTIFIER "com.zep")
 
 list(INSERT CMAKE_MODULE_PATH 0 ${CMAKE_CURRENT_LIST_DIR}/cmake)
 
+find_package(gsl-lite REQUIRED)
+find_package(SDL2 REQUIRED)
+find_package(fmt REQUIRED)
+find_package(gl3w REQUIRED)
+find_package(imgui REQUIRED)
+find_package(freetype CONFIG REQUIRED)
+find_package(unofficial-concurrentqueue REQUIRED)
+find_package(tinyfiledialogs REQUIRED)
+
 include(${M3RDPARTY_DIR}/list.cmake)
 include(${CMAKE_CURRENT_LIST_DIR}/cmake/demo_common.cmake)
 add_subdirectory(demo_imgui)

demos/CMakeLists.txt

@@ -23,9 +23,9 @@ endif()
 
 if (NOT IS_QT)
     set(RESOURCE_DEPLOY_FILES ${RESOURCE_DEPLOY_FILES}
-        ${MUTILS_INCLUDE_DIR}/imgui/misc/fonts/Cousine-Regular.ttf
-        ${MUTILS_INCLUDE_DIR}/imgui/misc/fonts/DroidSans.ttf
-        ${MUTILS_INCLUDE_DIR}/imgui/misc/fonts/Roboto-Medium.ttf)
+        ${DEMO_ROOT}/demo_imgui/res/Cousine-Regular.ttf
+        ${DEMO_ROOT}/demo_imgui/res/DroidSans.ttf
+        ${DEMO_ROOT}/demo_imgui/res/Roboto-Medium.ttf)
 endif()
 
 if (WIN32)

demos/cmake/demo_common.cmake

@@ -1,8 +1,80 @@
 #pragma once
 
+#include <filesystem>
+#include <chrono>
+#include <thread>
+#include <unordered_map>
+#include <string>
+#include <functional>
+
 namespace Zep
 {
 const float DemoFontPtSize = 14.0f;
+
+
+// Define available file changes
+enum class FileStatus {created, modified, erased};
+
+class FileWatcher {
+public:
+    std::string path_to_watch;
+    // Time interval at which we check the base folder for changes
+    std::chrono::duration<int, std::milli> delay;
+
+    // Keep a record of files from the base directory and their last modification time
+    FileWatcher(std::string path_to_watch, std::chrono::duration<int, std::milli> delay) : path_to_watch{path_to_watch}, delay{delay} {
+        for(auto &file : std::filesystem::recursive_directory_iterator(path_to_watch)) {
+            paths_[file.path().string()] = std::filesystem::last_write_time(file);
+        }
+    }
+
+    // Monitor "path_to_watch" for changes and in case of a change execute the user supplied "action" function
+    void start(const std::function<void (std::string, FileStatus)> &action) {
+        while(running_) {
+            // Wait for "delay" milliseconds
+            std::this_thread::sleep_for(delay);
+
+            auto it = paths_.begin();
+            while (it != paths_.end()) {
+                if (!std::filesystem::exists(it->first)) {
+                    action(it->first, FileStatus::erased);
+                    it = paths_.erase(it);
+                }
+                else {
+                    it++;
+                }                    
+            }
+
+            // Check if a file was created or modified
+            for(auto &file : std::filesystem::recursive_directory_iterator(path_to_watch)) {
+                auto current_file_last_write_time = std::filesystem::last_write_time(file);
+
+                // File creation
+                if(!contains(file.path().string())) {
+                    paths_[file.path().string()] = current_file_last_write_time;
+                    action(file.path().string(), FileStatus::created);
+                // File modification
+                } else {
+                    if(paths_[file.path().string()] != current_file_last_write_time) {
+                        paths_[file.path().string()] = current_file_last_write_time;
+                        action(file.path().string(), FileStatus::modified);
+                    }
+                }
+            }
+        }
+    }
+private:
+    std::unordered_map<std::string, std::filesystem::file_time_type> paths_;
+    bool running_ = true;
+
+    // Check if "paths_" contains a given key
+    // If your compiler supports C++20 use paths_.contains(key) instead of this function
+    bool contains(const std::string &key) {
+        auto el = paths_.find(key);
+        return el != paths_.end();
+    }
+};
+
 } // Zep