Merge pull request #435 from Ygrik2003/Refactoring-cmake

Refactoring cmake

CMakeLists.txt

@@ -1,84 +1,47 @@
 cmake_minimum_required(VERSION 3.26)
 project(VoxelEngine)
 
-option(VOXELENGINE_BUILD_APPDIR "" OFF)
-option(VOXELENGINE_BUILD_TESTS "" OFF)
-
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 
+execute_process(COMMAND ${CMAKE_COMMAND} --version)
+
+option(VOXELENGINE_BUILD_APPDIR "Pack linux build" OFF)
+option(VOXELENGINE_BUILD_TESTS "Build tests" OFF)
+
+# Need for static compilation on Windows with MSVC clang TODO: Make single build
+# on Windows to avoid dependence on combinations of platforms and compilers and
+# make it independent
 if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
     # We use two types linking: for clang build is static (vcpkg triplet
     # x64-windows-static) and for msvc build is dynamic linking (vcpkg triplet
     # x64-windows) By default CMAKE_MSVC_RUNTIME_LIBRARY set by
     # MultiThreaded$<$<CONFIG:Debug>:Debug>DLL
     if(VCPKG_TARGET_TRIPLET MATCHES "static")
+        # Need for MSVC clang
         set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
     endif()
 endif()
 
 add_subdirectory(src)
-add_executable(${PROJECT_NAME} src/main.cpp)
-target_include_directories(${PROJECT_NAME}
-                           PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src)
+add_executable(VoxelEngine src/main.cpp)
 
 if(VOXELENGINE_BUILD_APPDIR)
     include(${CMAKE_CURRENT_SOURCE_DIR}/dev/cmake/BuildAppdir.cmake)
 endif()
 
-if(MSVC)
-    if(NOT CMAKE_BUILD_TYPE)
-        set(CMAKE_BUILD_TYPE
-            Release
-            CACHE STRING "Build type" FORCE)
-    endif()
-    if((CMAKE_BUILD_TYPE EQUAL "Release") OR (CMAKE_BUILD_TYPE EQUAL
-                                              "RelWithDebInfo"))
-        target_compile_options(${PROJECT_NAME} PRIVATE /W4 /MT /O2)
-    else()
-        target_compile_options(${PROJECT_NAME} PRIVATE /W4)
-    endif()
-    set(CMAKE_CXX_FLAGS
-        "${CMAKE_CXX_FLAGS} /source-charset:UTF-8 /D_DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR"
-    )
-else()
-    target_compile_options(
-        ${PROJECT_NAME}
-        PRIVATE -Wall
-                -Wextra
-                # additional warnings
-                -Wformat-nonliteral
-                -Wcast-align
-                -Wpointer-arith
-                -Wundef
-                -Wwrite-strings
-                -Wno-unused-parameter)
-    if(CMAKE_BUILD_TYPE MATCHES "Debug")
-        target_compile_options(${PROJECT_NAME} PRIVATE -Og)
-    endif()
-    if(WIN32)
-        set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -static")
-    endif()
-endif()
+target_link_libraries(VoxelEngine PRIVATE VoxelEngineSrc
+                                          $<$<PLATFORM_ID:Windows>:winmm>)
 
-if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
-    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -no-pie")
-endif()
-
-if(WIN32)
-    target_link_libraries(${PROJECT_NAME} VoxelEngineSrc winmm)
-endif()
-
-target_link_libraries(${PROJECT_NAME} VoxelEngineSrc ${CMAKE_DL_LIBS})
+target_link_options(VoxelEngine PRIVATE $<$<CXX_COMPILER_ID:GNU>:-no-pie>)
 
 # Deploy res to build dir
 add_custom_command(
-    TARGET ${PROJECT_NAME}
+    TARGET VoxelEngine
     POST_BUILD
-    COMMAND
-        ${CMAKE_COMMAND} -E copy_directory_if_different
-        ${CMAKE_CURRENT_SOURCE_DIR}/res $<TARGET_FILE_DIR:${PROJECT_NAME}>/res)
+    COMMAND ${CMAKE_COMMAND} -E copy_directory_if_different
+            ${CMAKE_CURRENT_SOURCE_DIR}/res $<TARGET_FILE_DIR:VoxelEngine>/res)
 
 if(VOXELENGINE_BUILD_TESTS)
     enable_testing()