From ffe620636dbc8b9b8c489bf6d7e5c13b69e6b86b Mon Sep 17 00:00:00 2001 From: Dreaded_X Date: Sun, 14 Jun 2020 20:01:04 +0200 Subject: [PATCH] Switched to cmake --- .gitignore | 12 +- .vimlocal | 4 +- CMakeLists.txt | 16 ++ cmake/CPM.cmake | 475 ++++++++++++++++++++++++++++++++++ cmake/tools.cmake | 57 ++++ ecs-lua/CMakeLists.txt | 62 +++++ ecs-lua/include/ecs-lua.h | 2 +- ecs-lua/src/ecs-lua.cpp | 9 +- ecs-serial/CMakeLists.txt | 43 +++ ecs-serial/src/ecs-serial.cpp | 2 + ecs/CMakeLists.txt | 58 +++++ flint.yaml | 73 ------ scripts/generate.py | 16 +- template.mako | 2 +- test/CMakeLists.txt | 44 ++++ 15 files changed, 784 insertions(+), 91 deletions(-) create mode 100644 CMakeLists.txt create mode 100644 cmake/CPM.cmake create mode 100644 cmake/tools.cmake create mode 100644 ecs-lua/CMakeLists.txt create mode 100644 ecs-serial/CMakeLists.txt create mode 100644 ecs/CMakeLists.txt delete mode 100644 flint.yaml create mode 100644 test/CMakeLists.txt diff --git a/.gitignore b/.gitignore index 094f734..7c7f303 100644 --- a/.gitignore +++ b/.gitignore @@ -16,6 +16,11 @@ # .nfs files are created when an open file is removed but is still being accessed .nfs* +### premake-gmake ### +Makefile +*.make +build/ + ### Vim ### # swap [._]*.s[a-v][a-z] @@ -28,12 +33,7 @@ Session.vim .netrwhist # auto-generated tag files tags - -# flint -.build - -# Custom .clangd/ compile_commands.json -test/ids + test/entities diff --git a/.vimlocal b/.vimlocal index d604bfd..f742eb2 100644 --- a/.vimlocal +++ b/.vimlocal @@ -1,3 +1,3 @@ -let &makeprg="../flint2/.build/bin/flint" +let &makeprg="cmake --build build -t ecs_test" map :Make -map :Start ./.build/bin/test && read +map :Start cd test && ./../build/test/ecs_test save && read diff --git a/CMakeLists.txt b/CMakeLists.txt new file mode 100644 index 0000000..ab8f28d --- /dev/null +++ b/CMakeLists.txt @@ -0,0 +1,16 @@ +cmake_minimum_required(VERSION 3.14 FATAL_ERROR) + +project(ecs) + +if(PROJECT_SOURCE_DIR STREQUAL PROJECT_BINARY_DIR) + message(FATAL_ERROR "In-source builds not allowed. Please make a new directory (called a build directory) and run CMake from there.") +endif() + +include(cmake/tools.cmake) + +add_subdirectory(ecs) +add_subdirectory(ecs-lua) +add_subdirectory(ecs-serial) +add_subdirectory(test) + +set_target_properties(ecs_test PROPERTIES EXCLUDE_FROM_ALL YES) diff --git a/cmake/CPM.cmake b/cmake/CPM.cmake new file mode 100644 index 0000000..50d4fdd --- /dev/null +++ b/cmake/CPM.cmake @@ -0,0 +1,475 @@ +# CPM.cmake - CMake's missing package manager +# =========================================== +# See https://github.com/TheLartians/CPM.cmake for usage and update instructions. +# +# MIT License +# ----------- +#[[ + Copyright (c) 2019 Lars Melchior + + Permisson is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to deal + in the Software without restriction, including without limitation the rights + to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in all + copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + SOFTWARE. +]] + +cmake_minimum_required(VERSION 3.14 FATAL_ERROR) + +set(CURRENT_CPM_VERSION 0.26.2) + +if(CPM_DIRECTORY) + if(NOT CPM_DIRECTORY STREQUAL CMAKE_CURRENT_LIST_DIR) + if (CPM_VERSION VERSION_LESS CURRENT_CPM_VERSION) + message(AUTHOR_WARNING "${CPM_INDENT} \ +A dependency is using a more recent CPM version (${CURRENT_CPM_VERSION}) than the current project (${CPM_VERSION}). \ +It is recommended to upgrade CPM to the most recent version. \ +See https://github.com/TheLartians/CPM.cmake for more information." + ) + endif() + return() + endif() + + get_property(CPM_INITIALIZED GLOBAL "" PROPERTY CPM_INITIALIZED SET) + if (CPM_INITIALIZED) + return() + endif() +endif() + +set_property(GLOBAL PROPERTY CPM_INITIALIZED true) + +option(CPM_USE_LOCAL_PACKAGES "Always try to use `find_package` to get dependencies" $ENV{CPM_USE_LOCAL_PACKAGES}) +option(CPM_LOCAL_PACKAGES_ONLY "Only use `find_package` to get dependencies" $ENV{CPM_LOCAL_PACKAGES_ONLY}) +option(CPM_DOWNLOAD_ALL "Always download dependencies from source" $ENV{CPM_DOWNLOAD_ALL}) +option(CPM_DONT_UPDATE_MODULE_PATH "Don't update the module path to allow using find_package" $ENV{CPM_DONT_UPDATE_MODULE_PATH}) +option(CPM_DONT_CREATE_PACKAGE_LOCK "Don't create a package lock file in the binary path" $ENV{CPM_DONT_CREATE_PACKAGE_LOCK}) +option(CPM_INCLUDE_ALL_IN_PACKAGE_LOCK "Add all packages added through CPM.cmake to the package lock" $ENV{CPM_INCLUDE_ALL_IN_PACKAGE_LOCK}) + +set(CPM_VERSION ${CURRENT_CPM_VERSION} CACHE INTERNAL "") +set(CPM_DIRECTORY ${CMAKE_CURRENT_LIST_DIR} CACHE INTERNAL "") +set(CPM_FILE ${CMAKE_CURRENT_LIST_FILE} CACHE INTERNAL "") +set(CPM_PACKAGES "" CACHE INTERNAL "") +set(CPM_DRY_RUN OFF CACHE INTERNAL "Don't download or configure dependencies (for testing)") + +if(DEFINED ENV{CPM_SOURCE_CACHE}) + set(CPM_SOURCE_CACHE_DEFAULT $ENV{CPM_SOURCE_CACHE}) +else() + set(CPM_SOURCE_CACHE_DEFAULT OFF) +endif() + +set(CPM_SOURCE_CACHE ${CPM_SOURCE_CACHE_DEFAULT} CACHE PATH "Directory to downlaod CPM dependencies") + +if (NOT CPM_DONT_UPDATE_MODULE_PATH) + set(CPM_MODULE_PATH "${CMAKE_BINARY_DIR}/CPM_modules" CACHE INTERNAL "") + # remove old modules + FILE(REMOVE_RECURSE ${CPM_MODULE_PATH}) + file(MAKE_DIRECTORY ${CPM_MODULE_PATH}) + # locally added CPM modules should override global packages + set(CMAKE_MODULE_PATH "${CPM_MODULE_PATH};${CMAKE_MODULE_PATH}") +endif() + +if (NOT CPM_DONT_CREATE_PACKAGE_LOCK) + set(CPM_PACKAGE_LOCK_FILE "${CMAKE_BINARY_DIR}/cpm-package-lock.cmake" CACHE INTERNAL "") + file(WRITE ${CPM_PACKAGE_LOCK_FILE} "# CPM Package Lock\n# This file should be committed to version control\n\n") +endif() + +include(FetchContent) +include(CMakeParseArguments) + +# Initialize logging prefix +if(NOT CPM_INDENT) + set(CPM_INDENT "CPM:") +endif() + +function(cpm_find_package NAME VERSION) + string(REPLACE " " ";" EXTRA_ARGS "${ARGN}") + find_package(${NAME} ${VERSION} ${EXTRA_ARGS} QUIET) + if(${CPM_ARGS_NAME}_FOUND) + message(STATUS "${CPM_INDENT} using local package ${CPM_ARGS_NAME}@${VERSION}") + CPMRegisterPackage(${CPM_ARGS_NAME} "${VERSION}") + set(CPM_PACKAGE_FOUND YES PARENT_SCOPE) + else() + set(CPM_PACKAGE_FOUND NO PARENT_SCOPE) + endif() +endfunction() + +# Create a custom FindXXX.cmake module for a CPM package +# This prevents `find_package(NAME)` from finding the system library +function(CPMCreateModuleFile Name) + if (NOT CPM_DONT_UPDATE_MODULE_PATH) + # erase any previous modules + FILE(WRITE ${CPM_MODULE_PATH}/Find${Name}.cmake "include(${CPM_FILE})\n${ARGN}\nset(${Name}_FOUND TRUE)") + endif() +endfunction() + +# Find a package locally or fallback to CPMAddPackage +function(CPMFindPackage) + set(oneValueArgs + NAME + VERSION + FIND_PACKAGE_ARGUMENTS + ) + + cmake_parse_arguments(CPM_ARGS "" "${oneValueArgs}" "" ${ARGN}) + + if (NOT DEFINED CPM_ARGS_VERSION) + if (DEFINED CPM_ARGS_GIT_TAG) + cpm_get_version_from_git_tag("${CPM_ARGS_GIT_TAG}" CPM_ARGS_VERSION) + endif() + endif() + + if (CPM_DOWNLOAD_ALL) + CPMAddPackage(${ARGN}) + cpm_export_variables(${CPM_ARGS_NAME}) + return() + endif() + + CPMCheckIfPackageAlreadyAdded(${CPM_ARGS_NAME} "${CPM_ARGS_VERSION}" "${CPM_ARGS_OPTIONS}") + if (CPM_PACKAGE_ALREADY_ADDED) + cpm_export_variables(${CPM_ARGS_NAME}) + return() + endif() + + cpm_find_package(${CPM_ARGS_NAME} "${CPM_ARGS_VERSION}" ${CPM_ARGS_FIND_PACKAGE_ARGUMENTS}) + + if(NOT CPM_PACKAGE_FOUND) + CPMAddPackage(${ARGN}) + cpm_export_variables(${CPM_ARGS_NAME}) + endif() + +endfunction() + +# checks if a package has been added before +function(CPMCheckIfPackageAlreadyAdded CPM_ARGS_NAME CPM_ARGS_VERSION CPM_ARGS_OPTIONS) + if ("${CPM_ARGS_NAME}" IN_LIST CPM_PACKAGES) + CPMGetPackageVersion(${CPM_ARGS_NAME} CPM_PACKAGE_VERSION) + if("${CPM_PACKAGE_VERSION}" VERSION_LESS "${CPM_ARGS_VERSION}") + message(WARNING "${CPM_INDENT} requires a newer version of ${CPM_ARGS_NAME} (${CPM_ARGS_VERSION}) than currently included (${CPM_PACKAGE_VERSION}).") + endif() + if (CPM_ARGS_OPTIONS) + foreach(OPTION ${CPM_ARGS_OPTIONS}) + cpm_parse_option(${OPTION}) + if(NOT "${${OPTION_KEY}}" STREQUAL "${OPTION_VALUE}") + message(WARNING "${CPM_INDENT} ignoring package option for ${CPM_ARGS_NAME}: ${OPTION_KEY} = ${OPTION_VALUE} (${${OPTION_KEY}})") + endif() + endforeach() + endif() + cpm_get_fetch_properties(${CPM_ARGS_NAME}) + SET(${CPM_ARGS_NAME}_ADDED NO) + SET(CPM_PACKAGE_ALREADY_ADDED YES PARENT_SCOPE) + cpm_export_variables(${CPM_ARGS_NAME}) + else() + SET(CPM_PACKAGE_ALREADY_ADDED NO PARENT_SCOPE) + endif() +endfunction() + +# Download and add a package from source +function(CPMAddPackage) + + set(oneValueArgs + NAME + FORCE + VERSION + GIT_TAG + DOWNLOAD_ONLY + GITHUB_REPOSITORY + GITLAB_REPOSITORY + GIT_REPOSITORY + SOURCE_DIR + DOWNLOAD_COMMAND + FIND_PACKAGE_ARGUMENTS + ) + + set(multiValueArgs + OPTIONS + ) + + cmake_parse_arguments(CPM_ARGS "" "${oneValueArgs}" "${multiValueArgs}" "${ARGN}") + + # Set default values for arguments + + if (NOT DEFINED CPM_ARGS_VERSION) + if (DEFINED CPM_ARGS_GIT_TAG) + cpm_get_version_from_git_tag("${CPM_ARGS_GIT_TAG}" CPM_ARGS_VERSION) + endif() + endif() + + if(CPM_ARGS_DOWNLOAD_ONLY) + set(DOWNLOAD_ONLY ${CPM_ARGS_DOWNLOAD_ONLY}) + else() + set(DOWNLOAD_ONLY NO) + endif() + + if (DEFINED CPM_ARGS_GITHUB_REPOSITORY) + set(CPM_ARGS_GIT_REPOSITORY "https://github.com/${CPM_ARGS_GITHUB_REPOSITORY}.git") + endif() + + if (DEFINED CPM_ARGS_GITLAB_REPOSITORY) + list(CPM_ARGS_GIT_REPOSITORY "https://gitlab.com/${CPM_ARGS_GITLAB_REPOSITORY}.git") + endif() + + if (DEFINED CPM_ARGS_GIT_REPOSITORY) + list(APPEND CPM_ARGS_UNPARSED_ARGUMENTS GIT_REPOSITORY ${CPM_ARGS_GIT_REPOSITORY}) + if (NOT DEFINED CPM_ARGS_GIT_TAG) + set(CPM_ARGS_GIT_TAG v${CPM_ARGS_VERSION}) + endif() + endif() + + if (DEFINED CPM_ARGS_GIT_TAG) + list(APPEND CPM_ARGS_UNPARSED_ARGUMENTS GIT_TAG ${CPM_ARGS_GIT_TAG}) + endif() + + # Check if package has been added before + CPMCheckIfPackageAlreadyAdded(${CPM_ARGS_NAME} "${CPM_ARGS_VERSION}" "${CPM_ARGS_OPTIONS}") + if (CPM_PACKAGE_ALREADY_ADDED) + cpm_export_variables(${CPM_ARGS_NAME}) + return() + endif() + + # Check for manual overrides + if (NOT CPM_ARGS_FORCE AND NOT "${CPM_${CPM_ARGS_NAME}_SOURCE}" STREQUAL "") + set(PACKAGE_SOURCE ${CPM_${CPM_ARGS_NAME}_SOURCE}) + set(CPM_${CPM_ARGS_NAME}_SOURCE "") + CPMAddPackage( + NAME ${CPM_ARGS_NAME} + SOURCE_DIR ${PACKAGE_SOURCE} + FORCE True + ) + cpm_export_variables(${CPM_ARGS_NAME}) + return() + endif() + + # Check for available declaration + if (NOT CPM_ARGS_FORCE AND NOT "${CPM_DECLARATION_${CPM_ARGS_NAME}}" STREQUAL "") + set(declaration ${CPM_DECLARATION_${CPM_ARGS_NAME}}) + set(CPM_DECLARATION_${CPM_ARGS_NAME} "") + CPMAddPackage(${declaration}) + cpm_export_variables(${CPM_ARGS_NAME}) + # checking again to ensure version and option compatibility + CPMCheckIfPackageAlreadyAdded(${CPM_ARGS_NAME} "${CPM_ARGS_VERSION}" "${CPM_ARGS_OPTIONS}") + return() + endif() + + if(CPM_USE_LOCAL_PACKAGES OR CPM_LOCAL_PACKAGES_ONLY) + cpm_find_package(${CPM_ARGS_NAME} "${CPM_ARGS_VERSION}" ${CPM_ARGS_FIND_PACKAGE_ARGUMENTS}) + + if(CPM_PACKAGE_FOUND) + cpm_export_variables(${CPM_ARGS_NAME}) + return() + endif() + + if(CPM_LOCAL_PACKAGES_ONLY) + message(SEND_ERROR "CPM: ${CPM_ARGS_NAME} not found via find_package(${CPM_ARGS_NAME} ${CPM_ARGS_VERSION})") + endif() + endif() + + CPMRegisterPackage("${CPM_ARGS_NAME}" "${CPM_ARGS_VERSION}") + + if (CPM_ARGS_OPTIONS) + foreach(OPTION ${CPM_ARGS_OPTIONS}) + cpm_parse_option(${OPTION}) + set(${OPTION_KEY} ${OPTION_VALUE} CACHE INTERNAL "") + endforeach() + endif() + + if (DEFINED CPM_ARGS_GIT_TAG) + set(PACKAGE_INFO "${CPM_ARGS_GIT_TAG}") + elseif (DEFINED CPM_ARGS_SOURCE_DIR) + set(PACKAGE_INFO "${CPM_ARGS_SOURCE_DIR}") + else() + set(PACKAGE_INFO "${CPM_ARGS_VERSION}") + endif() + + if (DEFINED CPM_ARGS_DOWNLOAD_COMMAND) + list(APPEND CPM_ARGS_UNPARSED_ARGUMENTS DOWNLOAD_COMMAND ${CPM_ARGS_DOWNLOAD_COMMAND}) + elseif (DEFINED CPM_ARGS_SOURCE_DIR) + list(APPEND CPM_ARGS_UNPARSED_ARGUMENTS SOURCE_DIR ${CPM_ARGS_SOURCE_DIR}) + elseif (CPM_SOURCE_CACHE) + string(TOLOWER ${CPM_ARGS_NAME} lower_case_name) + set(origin_parameters ${CPM_ARGS_UNPARSED_ARGUMENTS}) + list(SORT origin_parameters) + string(SHA1 origin_hash "${origin_parameters}") + set(download_directory ${CPM_SOURCE_CACHE}/${lower_case_name}/${origin_hash}) + list(APPEND CPM_ARGS_UNPARSED_ARGUMENTS SOURCE_DIR ${download_directory}) + if (EXISTS ${download_directory}) + # disable the download command to allow offline builds + list(APPEND CPM_ARGS_UNPARSED_ARGUMENTS DOWNLOAD_COMMAND "${CMAKE_COMMAND}") + set(PACKAGE_INFO "${download_directory}") + else() + # remove timestamps so CMake will re-download the dependency + file(REMOVE_RECURSE ${CMAKE_BINARY_DIR}/_deps/${lower_case_name}-subbuild) + set(PACKAGE_INFO "${PACKAGE_INFO} -> ${download_directory}") + endif() + endif() + + CPMCreateModuleFile(${CPM_ARGS_NAME} "CPMAddPackage(${ARGN})") + + if (CPM_PACKAGE_LOCK_ENABLED) + if ((CPM_ARGS_VERSION AND NOT CPM_ARGS_SOURCE_DIR) OR CPM_INCLUDE_ALL_IN_PACKAGE_LOCK) + cpm_add_to_package_lock(${CPM_ARGS_NAME} "${ARGN}") + elseif(CPM_ARGS_SOURCE_DIR) + cpm_add_comment_to_package_lock(${CPM_ARGS_NAME} "local directory") + else() + cpm_add_comment_to_package_lock(${CPM_ARGS_NAME} "${ARGN}") + endif() + endif() + + cpm_declare_fetch("${CPM_ARGS_NAME}" "${CPM_ARGS_VERSION}" "${PACKAGE_INFO}" "${CPM_ARGS_UNPARSED_ARGUMENTS}") + cpm_fetch_package("${CPM_ARGS_NAME}" "${DOWNLOAD_ONLY}") + cpm_get_fetch_properties("${CPM_ARGS_NAME}") + + SET(${CPM_ARGS_NAME}_ADDED YES) + cpm_export_variables("${CPM_ARGS_NAME}") +endfunction() + +# Fetch a previously declared package +macro(CPMGetPackage Name) + if (DEFINED "CPM_DECLARATION_${Name}") + CPMAddPackage( + NAME ${Name} + ) + else() + message(SEND_ERROR "Cannot retrieve package ${Name}: no declaration available") + endif() +endmacro() + +# export variables available to the caller to the parent scope +# expects ${CPM_ARGS_NAME} to be set +macro(cpm_export_variables name) + SET(${name}_SOURCE_DIR "${${name}_SOURCE_DIR}" PARENT_SCOPE) + SET(${name}_BINARY_DIR "${${name}_BINARY_DIR}" PARENT_SCOPE) + SET(${name}_ADDED "${${name}_ADDED}" PARENT_SCOPE) +endmacro() + +# declares a package, so that any call to CPMAddPackage for the +# package name will use these arguments instead. +# Previous declarations will not be overriden. +macro(CPMDeclarePackage Name) + if (NOT DEFINED "CPM_DECLARATION_${Name}") + set("CPM_DECLARATION_${Name}" "${ARGN}") + endif() +endmacro() + +function(cpm_add_to_package_lock Name) + if (NOT CPM_DONT_CREATE_PACKAGE_LOCK) + file(APPEND ${CPM_PACKAGE_LOCK_FILE} "# ${Name}\nCPMDeclarePackage(${Name} \"${ARGN}\")\n") + endif() +endfunction() + +function(cpm_add_comment_to_package_lock Name) + if (NOT CPM_DONT_CREATE_PACKAGE_LOCK) + file(APPEND ${CPM_PACKAGE_LOCK_FILE} "# ${Name} (unversioned)\n# CPMDeclarePackage(${Name} \"${ARGN}\")\n") + endif() +endfunction() + +# includes the package lock file if it exists and creates a target +# `cpm-write-package-lock` to update it +macro(CPMUsePackageLock file) + if (NOT CPM_DONT_CREATE_PACKAGE_LOCK) + get_filename_component(CPM_ABSOLUTE_PACKAGE_LOCK_PATH ${file} ABSOLUTE) + if(EXISTS ${CPM_ABSOLUTE_PACKAGE_LOCK_PATH}) + include(${CPM_ABSOLUTE_PACKAGE_LOCK_PATH}) + endif() + if (NOT TARGET cpm-update-package-lock) + add_custom_target(cpm-update-package-lock COMMAND ${CMAKE_COMMAND} -E copy ${CPM_PACKAGE_LOCK_FILE} ${CPM_ABSOLUTE_PACKAGE_LOCK_PATH}) + endif() + set(CPM_PACKAGE_LOCK_ENABLED true) + endif() +endmacro() + +# registers a package that has been added to CPM +function(CPMRegisterPackage PACKAGE VERSION) + list(APPEND CPM_PACKAGES ${PACKAGE}) + set(CPM_PACKAGES ${CPM_PACKAGES} CACHE INTERNAL "") + set("CPM_PACKAGE_${PACKAGE}_VERSION" ${VERSION} CACHE INTERNAL "") +endfunction() + +# retrieve the current version of the package to ${OUTPUT} +function(CPMGetPackageVersion PACKAGE OUTPUT) + set(${OUTPUT} "${CPM_PACKAGE_${PACKAGE}_VERSION}" PARENT_SCOPE) +endfunction() + +# declares a package in FetchContent_Declare +function (cpm_declare_fetch PACKAGE VERSION INFO) + message(STATUS "${CPM_INDENT} adding package ${PACKAGE}@${VERSION} (${INFO})") + + if (${CPM_DRY_RUN}) + message(STATUS "${CPM_INDENT} package not declared (dry run)") + return() + endif() + + FetchContent_Declare(${PACKAGE} + ${ARGN} + ) +endfunction() + +# returns properties for a package previously defined by cpm_declare_fetch +function (cpm_get_fetch_properties PACKAGE) + if (${CPM_DRY_RUN}) + return() + endif() + FetchContent_GetProperties(${PACKAGE}) + string(TOLOWER ${PACKAGE} lpackage) + SET(${PACKAGE}_SOURCE_DIR "${${lpackage}_SOURCE_DIR}" PARENT_SCOPE) + SET(${PACKAGE}_BINARY_DIR "${${lpackage}_BINARY_DIR}" PARENT_SCOPE) +endfunction() + +# downloads a previously declared package via FetchContent +function (cpm_fetch_package PACKAGE DOWNLOAD_ONLY) + if (${CPM_DRY_RUN}) + message(STATUS "${CPM_INDENT} package ${PACKAGE} not fetched (dry run)") + return() + endif() + + if(DOWNLOAD_ONLY) + FetchContent_GetProperties(${PACKAGE}) + if(NOT ${PACKAGE}_POPULATED) + FetchContent_Populate(${PACKAGE}) + endif() + else() + set(CPM_OLD_INDENT "${CPM_INDENT}") + set(CPM_INDENT "${CPM_INDENT} ${PACKAGE}:") + FetchContent_MakeAvailable(${PACKAGE}) + set(CPM_INDENT "${CPM_OLD_INDENT}") + endif() +endfunction() + +# splits a package option +function(cpm_parse_option OPTION) + string(REGEX MATCH "^[^ ]+" OPTION_KEY ${OPTION}) + string(LENGTH ${OPTION} OPTION_LENGTH) + string(LENGTH ${OPTION_KEY} OPTION_KEY_LENGTH) + if (OPTION_KEY_LENGTH STREQUAL OPTION_LENGTH) + # no value for key provided, assume user wants to set option to "ON" + set(OPTION_VALUE "ON") + else() + math(EXPR OPTION_KEY_LENGTH "${OPTION_KEY_LENGTH}+1") + string(SUBSTRING ${OPTION} "${OPTION_KEY_LENGTH}" "-1" OPTION_VALUE) + endif() + set(OPTION_KEY "${OPTION_KEY}" PARENT_SCOPE) + set(OPTION_VALUE "${OPTION_VALUE}" PARENT_SCOPE) +endfunction() + +# guesses the package version from a git tag +function(cpm_get_version_from_git_tag GIT_TAG RESULT) + string(LENGTH ${GIT_TAG} length) + if (length EQUAL 40) + # GIT_TAG is probably a git hash + SET(${RESULT} 0 PARENT_SCOPE) + else() + string(REGEX MATCH "v?([0123456789.]*).*" _ ${GIT_TAG}) + SET(${RESULT} ${CMAKE_MATCH_1} PARENT_SCOPE) + endif() +endfunction() diff --git a/cmake/tools.cmake b/cmake/tools.cmake new file mode 100644 index 0000000..b0b8c30 --- /dev/null +++ b/cmake/tools.cmake @@ -0,0 +1,57 @@ +# this file contains a list of tools that can be activated and downloaded on-demand +# each tool is enabled during configuration by passing an additional `-DUSE_=` argument to CMake + +# only activate tools for top level project +if (NOT PROJECT_SOURCE_DIR STREQUAL CMAKE_SOURCE_DIR) + return() +endif() + +include(${CMAKE_CURRENT_LIST_DIR}/CPM.cmake) + +# enables sanitizers support using the the `USE_SANITIZER` flag +# available values are: Address, Memory, MemoryWithOrigins, Undefined, Thread, Leak, 'Address;Undefined' +if (USE_SANITIZER OR USE_STATIC_ANALYZER) + CPMAddPackage( + NAME StableCoder-cmake-scripts + GITHUB_REPOSITORY StableCoder/cmake-scripts + GIT_TAG 3d2d5a9fb26f0ce24e3e4eaeeff686ec2ecfb3fb + ) + + if (USE_SANITIZER) + include(${StableCoder-cmake-scripts_SOURCE_DIR}/sanitizers.cmake) + endif() + + if (USE_STATIC_ANALYZER) + if ("clang-tidy" IN_LIST USE_STATIC_ANALYZER) + SET(CLANG_TIDY ON CACHE INTERNAL "") + else() + SET(CLANG_TIDY OFF CACHE INTERNAL "") + endif() + if ("iwyu" IN_LIST USE_STATIC_ANALYZER) + SET(IWYU ON CACHE INTERNAL "") + else() + SET(IWYU OFF CACHE INTERNAL "") + endif() + if ("cppcheck" IN_LIST USE_STATIC_ANALYZER) + SET(CPPCHECK ON CACHE INTERNAL "") + else() + SET(CPPCHECK OFF CACHE INTERNAL "") + endif() + + include(${StableCoder-cmake-scripts_SOURCE_DIR}/tools.cmake) + + clang_tidy(${CLANG_TIDY_ARGS}) + include_what_you_use(${IWYU_ARGS}) + cppcheck(${CPPCHECK_ARGS}) + endif() +endif() + +# enables CCACHE support through the USE_CCACHE flag +# possible values are: YES, NO or equivalent +if (USE_CCACHE) + CPMAddPackage( + NAME Ccache.cmake + GITHUB_REPOSITORY TheLartians/Ccache.cmake + VERSION 1.1 + ) +endif() diff --git a/ecs-lua/CMakeLists.txt b/ecs-lua/CMakeLists.txt new file mode 100644 index 0000000..3f11276 --- /dev/null +++ b/ecs-lua/CMakeLists.txt @@ -0,0 +1,62 @@ +cmake_minimum_required(VERSION 3.5 FATAL_ERROR) + +project(ecs-lua + LANGUAGES CXX +) + +include(../cmake/CPM.cmake) + +CPMAddPackage( + NAME PackageProject.cmake + GITHUB_REPOSITORY TheLartians/PackageProject.cmake + VERSION 1.3 +) + +CPMAddPackage( + NAME lua + GITHUB_REPOSITORY lua/lua + VERSION 5.2.3 + DOWNLOAD_ONLY YES +) + +if (lua_ADDED) + # lua has no CMake support, so we create our own target + + FILE(GLOB lua_sources ${lua_SOURCE_DIR}/*.c) + add_library(lua STATIC ${lua_sources}) + + target_include_directories(lua + PUBLIC + $ + ) +endif() + +CPMAddPackage( + NAME sol2 + GIT_REPOSITORY https://github.com/ThePhD/sol2 + VERSION 3.2.0 +) + +file(GLOB_RECURSE headers CONFIGURE_DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/include/*.h") +file(GLOB_RECURSE sources CONFIGURE_DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp) + +add_library(${PROJECT_NAME} ${headers} ${sources}) + +# being a cross-platform target, we enforce standards conformance on MSVC +target_compile_options(${PROJECT_NAME} PUBLIC "$<$:/permissive->") + +# Link dependencies (if required) +target_link_libraries(${PROJECT_NAME} PUBLIC ecs ecs-serial lua sol2) + +set_target_properties(${PROJECT_NAME} PROPERTIES + CXX_STANDARD 20 + OUTPUT_NAME "${PROJECT_NAME}" +) + +string(TOLOWER ${PROJECT_NAME}/version.h VERSION_HEADER_LOCATION) + +target_include_directories(${PROJECT_NAME} + PUBLIC + $ + $ +) diff --git a/ecs-lua/include/ecs-lua.h b/ecs-lua/include/ecs-lua.h index aeea9f1..1d8d176 100644 --- a/ecs-lua/include/ecs-lua.h +++ b/ecs-lua/include/ecs-lua.h @@ -1,6 +1,6 @@ #pragma once -#include "sol.hpp" +#include "sol/sol.hpp" #include "ecs.h" #include diff --git a/ecs-lua/src/ecs-lua.cpp b/ecs-lua/src/ecs-lua.cpp index 5300eeb..0bb730d 100644 --- a/ecs-lua/src/ecs-lua.cpp +++ b/ecs-lua/src/ecs-lua.cpp @@ -2,9 +2,9 @@ #include "ecs.h" -#ifdef _OPTIONAL_ECS_SERIAL +// #ifdef _OPTIONAL_ECS_SERIAL #include "ecs-serial.h" -#endif +// #endif namespace sol { template<> @@ -109,7 +109,8 @@ namespace ecs::lua { } } - #ifdef _OPTIONAL_ECS_SERIAL + // @todo We need to make this a cmake flag + // #ifdef _OPTIONAL_ECS_SERIAL auto serialize = [map, name] (std::ostream& os, ecs::Component* component) { LuaComponent* wrapper = (LuaComponent*)component; @@ -194,7 +195,7 @@ namespace ecs::lua { }; ecs::serial::register_component_custom(id, serialize, deserialize, create); - #endif + // #endif sol::table component = lua.create_table(); component["_id"] = id; diff --git a/ecs-serial/CMakeLists.txt b/ecs-serial/CMakeLists.txt new file mode 100644 index 0000000..0be1c19 --- /dev/null +++ b/ecs-serial/CMakeLists.txt @@ -0,0 +1,43 @@ +cmake_minimum_required(VERSION 3.5 FATAL_ERROR) + +project(ecs-serial + LANGUAGES CXX +) + +include(../cmake/CPM.cmake) + +CPMAddPackage( + NAME PackageProject.cmake + GITHUB_REPOSITORY TheLartians/PackageProject.cmake + VERSION 1.3 +) + +CPMAddPackage( + NAME io + GIT_REPOSITORY https://git.mtgames.nl/Dreaded_X/io + GIT_TAG master +) + +file(GLOB_RECURSE headers CONFIGURE_DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/include/*.h") +file(GLOB_RECURSE sources CONFIGURE_DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp) + +add_library(${PROJECT_NAME} ${headers} ${sources}) + +# being a cross-platform target, we enforce standards conformance on MSVC +target_compile_options(${PROJECT_NAME} PUBLIC "$<$:/permissive->") + +# Link dependencies (if required) +target_link_libraries(${PROJECT_NAME} PUBLIC ecs io) + +set_target_properties(${PROJECT_NAME} PROPERTIES + CXX_STANDARD 20 + OUTPUT_NAME "${PROJECT_NAME}" +) + +string(TOLOWER ${PROJECT_NAME}/version.h VERSION_HEADER_LOCATION) + +target_include_directories(${PROJECT_NAME} + PUBLIC + $ + $ +) diff --git a/ecs-serial/src/ecs-serial.cpp b/ecs-serial/src/ecs-serial.cpp index c0c153c..34b144c 100644 --- a/ecs-serial/src/ecs-serial.cpp +++ b/ecs-serial/src/ecs-serial.cpp @@ -1,6 +1,7 @@ #include "ecs-serial.h" #include "ecs.h" +#include #include #include @@ -25,6 +26,7 @@ namespace ecs::serial { for (auto [id, component] : components) { auto functions = internal::functions.find(id); if (functions == internal::functions.end()) { + std::cerr << "ID: " << id << '\n'; throw std::runtime_error("No known serializer for id"); } diff --git a/ecs/CMakeLists.txt b/ecs/CMakeLists.txt new file mode 100644 index 0000000..1656c4c --- /dev/null +++ b/ecs/CMakeLists.txt @@ -0,0 +1,58 @@ +cmake_minimum_required(VERSION 3.5 FATAL_ERROR) + +project(ecs + LANGUAGES CXX +) + +include(../cmake/CPM.cmake) + +CPMAddPackage( + NAME PackageProject.cmake + GITHUB_REPOSITORY TheLartians/PackageProject.cmake + VERSION 1.3 +) + +CPMAddPackage( + NAME stduuid + GITHUB_REPOSITORY mariusbancila/stduuid + GIT_TAG master + DOWNLOAD_ONLY YES +) +if (stduuid_ADDED) + add_library(stduuid INTERFACE) + set_target_properties(stduuid PROPERTIES INTERFACE_COMPILE_FEATURES cxx_std_20) + target_include_directories(stduuid INTERFACE ${stduuid_SOURCE_DIR}/include) + if(WIN32) + elseif(APPLE) + find_library(CFLIB CoreFoundation) + target_link_libraries(stduuid INTERFACE ${CFLIB}) + else() + find_library(LIBUUID_LIBRARIES uuid) + target_link_libraries(stduuid INTERFACE ${LIBUUID_LIBRARIES}) + endif() +endif() + + +file(GLOB_RECURSE headers CONFIGURE_DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/include/*.h") +file(GLOB_RECURSE sources CONFIGURE_DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp) + +add_library(${PROJECT_NAME} ${headers} ${sources}) + +# being a cross-platform target, we enforce standards conformance on MSVC +target_compile_options(${PROJECT_NAME} PUBLIC "$<$:/permissive->") + +# Link dependencies (if required) +target_link_libraries(${PROJECT_NAME} PUBLIC stduuid) + +set_target_properties(${PROJECT_NAME} PROPERTIES + CXX_STANDARD 20 + OUTPUT_NAME "${PROJECT_NAME}" +) + +string(TOLOWER ${PROJECT_NAME}/version.h VERSION_HEADER_LOCATION) + +target_include_directories(${PROJECT_NAME} + PUBLIC + $ + $ +) diff --git a/flint.yaml b/flint.yaml deleted file mode 100644 index beccade..0000000 --- a/flint.yaml +++ /dev/null @@ -1,73 +0,0 @@ -git: - sol2: - url: https://github.com/ThePhD/sol2 - revision: v3.2.0 - - stduuid: - url: https://github.com/mariusbancila/stduuid - - io: - url: https://git.mtgames.nl/Dreaded_X/io - -include: - - .build/git/io/flint.yaml - -scripts: - components: - step: pre - command: python scripts/generate.py - -targets: - sol2: - type: lib - git: sol2 - auto: false - include: - - single/include/sol - - link: - - lua - - stduuid: - type: lib - git: stduuid - platform: - linux: - link: - - uuid - - ecs: - type: lib - path: ecs - dependency: - - stduuid - - ecs_serial: - type: lib - path: ecs-serial - dependency: - - ecs - - io - - ecs-lua: - type: lib - path: ecs-lua - dependency: - - ecs - - sol2 - optional: - - ecs_serial - - test: - type: exe - path: test - include: - - ../.build/generated/test/components - dependency: - - ecs - - ecs-lua - - ecs_serial - script: - components: - in: test/include/components.h - out: ecs_components.h diff --git a/scripts/generate.py b/scripts/generate.py index a21098d..5b85aa6 100755 --- a/scripts/generate.py +++ b/scripts/generate.py @@ -1,5 +1,6 @@ #! /usr/bin/env python3 import sys +import os import clang.cindex from mako.template import Template @@ -71,20 +72,27 @@ def main(argv): output = argv[2] index = clang.cindex.Index.create() - tu = index.parse(filename, ['-x', 'c++', '-std=c++2a', '-Iecs/include', '-I.build/git/stduuid/include', '-I/lib/gcc/x86_64-pc-linux-gnu/9.3.0/include']) + tu = index.parse(filename, ['-x', 'c++', '-std=c++2a', f'-Iecs/include', f'-Ibuild/_deps/stduuid-src/include', '-I/lib/gcc/x86_64-pc-linux-gnu/10.1.0/include']) components = build_components(tu.cursor, filename) - tpl = Template(filename='template.mako') + tpl = Template(filename=f'template.mako') include_file = filename.split('/')[-1] + if not os.path.exists(os.path.dirname(output)): + try: + os.makedirs(os.path.dirname(output)) + except OSError as exc: + if exc.errno != errno.EEXIST: + raise + output_file = open(output, "w") output_file.write(tpl.render(components=components, include_file=include_file)) output_file.close() - # for d in tu.diagnostics: - # print(d) + for d in tu.diagnostics: + print(d) if __name__ == "__main__": main(sys.argv) diff --git a/template.mako b/template.mako index 16da442..5831f95 100644 --- a/template.mako +++ b/template.mako @@ -1,7 +1,7 @@ #include "${include_file}" #if __has_include("ecs-lua.h") -#include "sol.hpp" +#include "sol/sol.hpp" namespace generated { void init(sol::state& lua) { diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt new file mode 100644 index 0000000..8567587 --- /dev/null +++ b/test/CMakeLists.txt @@ -0,0 +1,44 @@ +cmake_minimum_required(VERSION 3.5 FATAL_ERROR) + +project(ecs_test + LANGUAGES CXX +) + +find_package(PythonInterp 3 REQUIRED) + +add_custom_command(OUTPUT ${PROJECT_BINARY_DIR}/include/ecs_components.h + WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/.. + COMMAND ${PYTHON_EXECUTABLE} scripts/generate.py test/include/components.h ${PROJECT_BINARY_DIR}/include/ecs_components.h + DEPENDS ${PROJECT_SOURCE_DIR}/../template.mako ${PROJECT_SOURCE_DIR}/../scripts/generate.py ${PROJECT_SOURCE_DIR}/include/components.h + COMMENT "Generating headers" +) + +file(GLOB_RECURSE headers CONFIGURE_DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/include/*.h") +file(GLOB_RECURSE sources CONFIGURE_DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp) + +add_executable(${PROJECT_NAME} ${headers} ${sources} ${PROJECT_BINARY_DIR}/include/ecs_components.h) + +# being a cross-platform target, we enforce standards conformance on MSVC +target_compile_options(${PROJECT_NAME} PUBLIC "$<$:/permissive->") + +# Link dependencies (if required) +target_link_libraries(${PROJECT_NAME} PUBLIC ecs ecs-lua ecs-serial) +# add_dependencies(${PROJECT_NAME} generate_test) + +set_target_properties(${PROJECT_NAME} PROPERTIES + CXX_STANDARD 20 + OUTPUT_NAME "${PROJECT_NAME}" +) + +string(TOLOWER ${PROJECT_NAME}/version.h VERSION_HEADER_LOCATION) + +target_include_directories(${PROJECT_NAME} + PUBLIC + $ + $ +) +target_include_directories(${PROJECT_NAME} + PUBLIC + $ + $ +)