Merge pull request #435 from Ygrik2003/Refactoring-cmake

Refactoring cmake

src/CMakeLists.txt

@@ -1,87 +1,122 @@
 project(VoxelEngineSrc)
 
-set(CMAKE_CXX_STANDARD 17)
+file(GLOB_RECURSE headers ${CMAKE_CURRENT_SOURCE_DIR}/*.hpp)
+file(GLOB_RECURSE sources ${CMAKE_CURRENT_SOURCE_DIR}/*.cpp)
+list(REMOVE_ITEM sources ${CMAKE_CURRENT_SOURCE_DIR}/main.cpp)
 
-file(GLOB_RECURSE HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/*.hpp)
-file(GLOB_RECURSE SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/*.cpp)
-list(REMOVE_ITEM SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/main.cpp)
-
-add_library(${PROJECT_NAME} STATIC ${SOURCES} ${HEADERS})
+add_library(VoxelEngineSrc STATIC ${sources} ${headers})
 
 find_package(OpenGL REQUIRED)
 find_package(GLEW REQUIRED)
+find_package(glm REQUIRED)
 if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
     # specific for vcpkg
     find_package(OpenAL CONFIG REQUIRED)
-    set(OPENAL_LIBRARY OpenAL::OpenAL)
 else()
     find_package(OpenAL REQUIRED)
 endif()
 find_package(ZLIB REQUIRED)
 find_package(PNG REQUIRED)
 find_package(CURL REQUIRED)
+find_package(glfw3 REQUIRED)
 if(NOT APPLE)
     find_package(EnTT REQUIRED)
 endif()
 
-set(LIBS "")
-
 if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
-    # Use directly linking to lib instead PkgConfig (because pkg-config dont
-    # install on windows as default) TODO: Do it with findLua.
-    if(MSVC)
-        set(LUA_INCLUDE_DIR
-            "$ENV{VCPKG_ROOT}/packages/luajit_${VCPKG_TARGET_TRIPLET}/include/luajit"
-        )
-        find_package(Lua REQUIRED)
-    else()
-        # Used for mingw-clang cross compiling from msys2
-        set(LIBS ${LIBS} luajit-5.1)
-    endif()
-    find_package(glfw3 REQUIRED)
-    find_package(glm REQUIRED)
     find_package(vorbis REQUIRED)
-    set(VORBISLIB Vorbis::vorbis Vorbis::vorbisfile)
+    if(VCPKG_TARGET_TRIPLET MATCHES "static")
+        add_library(luajit STATIC IMPORTED)
+        set_target_properties(
+            luajit
+            PROPERTIES
+                IMPORTED_LOCATION
+                "$ENV{VCPKG_ROOT}/packages/luajit_${VCPKG_TARGET_TRIPLET}/lib/libluajit-5.1.a"
+                INTERFACE_INCLUDE_DIRECTORIES
+                "$ENV{VCPKG_ROOT}/packages/luajit_${VCPKG_TARGET_TRIPLET}/include/"
+        )
+    else()
+        add_library(luajit SHARED IMPORTED)
+        set_target_properties(
+            luajit
+            PROPERTIES
+                IMPORTED_LOCATION
+                "$ENV{VCPKG_ROOT}/packages/luajit_${VCPKG_TARGET_TRIPLET}/bin/lua51.dll"
+                IMPORTED_IMPLIB
+                "$ENV{VCPKG_ROOT}/packages/luajit_${VCPKG_TARGET_TRIPLET}/lib/lua51.lib"
+                INTERFACE_INCLUDE_DIRECTORIES
+                "$ENV{VCPKG_ROOT}/packages/luajit_${VCPKG_TARGET_TRIPLET}/include/luajit"
+        )
+    endif()
 
-elseif(APPLE)
-    find_package(PkgConfig)
-    pkg_check_modules(LUAJIT REQUIRED luajit)
-    pkg_check_modules(VORBIS REQUIRED vorbis vorbisfile)
-    set(LUA_INCLUDE_DIR "/opt/homebrew/include/luajit-2.1")
-    set(LUA_LIBRARIES "/opt/homebrew/lib/libluajit-5.1.a")
-    message(STATUS "LUA Libraries: ${LUA_LIBRARIES}")
-    message(STATUS "LUA Include Dir: ${LUA_INCLUDE_DIR}")
-
-    set(VORBISLIB ${VORBIS_LDFLAGS})
-    message(STATUS "Vorbis Lib: ${VORBIS_LDFLAGS}")
+    add_library(luajit::luajit ALIAS luajit)
 else()
     find_package(PkgConfig)
-    pkg_check_modules(LUAJIT REQUIRED luajit)
-    pkg_check_modules(VORBIS REQUIRED vorbis vorbisfile)
-    set(LUA_LIBRARIES ${LUAJIT_LIBRARIES})
-    set(LUA_INCLUDE_DIR ${LUAJIT_INCLUDE_DIRS})
-    set(VORBISLIB ${VORBIS_LDFLAGS})
+
+    pkg_check_modules(luajit REQUIRED IMPORTED_TARGET luajit)
+    pkg_check_modules(vorbis REQUIRED IMPORTED_TARGET vorbis)
+    pkg_check_modules(vorbisfile REQUIRED IMPORTED_TARGET vorbisfile)
+    add_library(Vorbis::vorbis ALIAS PkgConfig::vorbis)
+    add_library(Vorbis::vorbisfile ALIAS PkgConfig::vorbisfile)
+    add_library(luajit::luajit ALIAS PkgConfig::luajit)
 endif()
 
-if(UNIX)
-    find_package(glfw3 3.3 REQUIRED)
-    find_package(Threads REQUIRED)
-    set(LIBS ${LIBS} Threads::Threads)
-endif()
+target_include_directories(VoxelEngineSrc PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
 
-include_directories(${LUA_INCLUDE_DIR})
-include_directories(${CURL_INCLUDE_DIR})
-target_include_directories(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
 target_link_libraries(
-    ${PROJECT_NAME}
-    ${LIBS}
-    glfw
-    OpenGL::GL
-    ${OPENAL_LIBRARY}
-    GLEW::GLEW
-    ZLIB::ZLIB
-    PNG::PNG
-    CURL::libcurl
-    ${VORBISLIB}
-    ${LUA_LIBRARIES}
-    ${CMAKE_DL_LIBS})
+    VoxelEngineSrc
+    PRIVATE glfw
+            OpenGL::GL
+            GLEW::GLEW
+            ZLIB::ZLIB
+            PNG::PNG
+            CURL::libcurl
+            OpenAL::OpenAL
+            Vorbis::vorbis
+            Vorbis::vorbisfile
+            luajit::luajit
+    PUBLIC glm::glm # Need public for src/delegates.hpp, which including to
+                    # main.cpp
+)
+
+target_compile_options(
+    VoxelEngineSrc
+    PUBLIC $<$<CXX_COMPILER_ID:MSVC>:
+           /utf-8
+           /MP
+           /D_DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR
+           /W4
+           /wd4244 # conversion from 'a' to 'T', possible loss of data
+           /wd4267 # conversion from 'size_t' to 'int', possible loss of data
+           /wd4245 # conversion from 'int' to 'const size_t', signed/unsigned
+                   # mismatch
+           /wd4100 # unreferenced formal parameter
+           /wd4458 # declaration of 'var' hides class member
+           /wd4101 # 'var': unreferenced local variable
+           /wd4388 # 'token' : signed/unsigned mismatch
+           /wd4018 # '>': signed/unsigned mismatch
+           >
+           $<$<NOT:$<CXX_COMPILER_ID:MSVC>>:
+           -Wall
+           -Wextra
+           # additional warnings
+           -Wformat-nonliteral
+           -Wcast-align
+           -Wpointer-arith
+           -Wundef
+           -Wwrite-strings
+           -Wno-unused-parameter
+           -Wno-sign-compare
+           $<$<CONFIG:Debug>:-Og>
+           >)
+
+target_link_options(
+    VoxelEngineSrc
+    PUBLIC
+    $<$<CXX_COMPILER_ID:GNU>:
+    -no-pie
+    >
+    # Need for static compilation on Windows with clang TODO: Make single build
+    # on Windows to avoid dependence on combinations of platforms and compilers
+    # and make it independent
+    $<$<PLATFORM_ID:Windows>:$<$<CXX_COMPILER_ID:Clang>:-static>>)

src/content/loading/GeneratorLoader.cpp

@@ -7,6 +7,7 @@
 #include "io/io.hpp"
 #include "io/engine_paths.hpp"
 #include "logic/scripting/scripting.hpp"
+#include "util/stringutil.hpp"
 #include "world/generator/GeneratorDef.hpp"
 #include "world/generator/VoxelFragment.hpp"
 #include "debug/Logger.hpp"

src/graphics/ui/elements/Label.cpp

@@ -1,12 +1,13 @@
 #include "Label.hpp"
 
 #include <utility>
+
+#include "assets/Assets.hpp"
 #include "graphics/core/DrawContext.hpp"
 #include "graphics/core/Batch2D.hpp"
 #include "graphics/core/Font.hpp"
-#include "assets/Assets.hpp"
+#include "graphics/ui/markdown.hpp"
 #include "util/stringutil.hpp"
-#include "../markdown.hpp"
 
 using namespace gui;
 

src/graphics/ui/elements/TextBox.cpp

@@ -1,15 +1,16 @@
 #include "TextBox.hpp"
 
+#include <algorithm>
 #include <sstream>
 #include <utility>
-#include <algorithm>
 
 #include "Label.hpp"
-#include "devtools/syntax_highlighting.hpp"
-#include "graphics/core/DrawContext.hpp"
-#include "graphics/core/Batch2D.hpp"
-#include "graphics/core/Font.hpp"
 #include "assets/Assets.hpp"
+#include "devtools/syntax_highlighting.hpp"
+#include "graphics/core/Batch2D.hpp"
+#include "graphics/core/DrawContext.hpp"
+#include "graphics/core/Font.hpp"
+#include "graphics/ui/markdown.hpp"
 #include "util/stringutil.hpp"
 #include "window/Events.hpp"
 #include "window/Window.hpp"

src/util/HandlersList.hpp

@@ -1,15 +1,15 @@
 #pragma once
 
-#include <mutex>
-#include <vector>
 #include <algorithm>
+#include <mutex>
 #include <unordered_map>
+#include <vector>
 
-#include "typedefs.hpp"
 #include "delegates.hpp"
+#include "typedefs.hpp"
 
 namespace util {
-    template<class...Types>
+    template <class... Types>
     class HandlersList {
         int nextid = 1;
         std::unordered_map<int, std::function<bool(Types...)>> handlers;
@@ -35,7 +35,7 @@ namespace util {
             int id = nextid++;
             handlers[id] = std::move(handler);
             order.push_back(id);
-            return observer_handler(new int(id), [this](int* id) { //-V508
+            return observer_handler(new int(id), [this](int* id) {  //-V508
                 std::lock_guard lock(mutex);
                 handlers.erase(*id);
                 order.erase(
@@ -45,7 +45,7 @@ namespace util {
             });
         }
 
-        void notify(Types...args) {
+        void notify(Types... args) {
             std::vector<int> orderCopy;
             decltype(handlers) handlersCopy;
             {

src/voxels/blocks_agent.hpp

@@ -13,6 +13,7 @@
 #include "content/Content.hpp"
 #include "maths/voxmaths.hpp"
 
+#include <algorithm>
 #include <set>
 #include <algorithm>
 #include <stdint.h>