Merge pull request #154 from Longwater1234/dev

CMAKE enhancements

Author: Longwater1234

CMakeLists.txt

@@ -7,14 +7,22 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
 
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED TRUE)
+set(CMAKE_CXX_EXTENSIONS OFF)
+
 if (NOT APPLE) 
   set(SFML_STATIC_LIBRARIES TRUE) 
 endif() 
 
+# write app version ONCE into Header
+configure_file(
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/proto_schema/AppVersion.hpp.in
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/AppVersion.hpp
+)
+
 # ==== UPDATE ME HERE ===========
 # Absolute path where you installed SFML (Required on Windows)
 set(SFML_HOME "C:/SFML/SFML-2.6.1") 
-set(SFML_DIR ${SFML_HOME}/lib/cmake/SFML)  
+set(SFML_DIR ${SFML_HOME}/lib/cmake/SFML)   
 # ==========================
 
 # Collect all sources
@@ -40,7 +48,7 @@ target_link_libraries(SpaceCheckers PRIVATE sfml-graphics sfml-window sfml-syste
                         ixwebsocket spdlog::spdlog cpr::cpr simdjson::simdjson protobuf::libprotobuf)
 
 # include SFML headers
-include_directories(${SFML_HOME}/include)     
+target_include_directories(SpaceCheckers PUBLIC ${SFML_HOME}/include)
 
 # show warnings (depending on C++ compiler)
 if (MSVC) 
@@ -56,4 +64,4 @@ if (NOT APPLE)
     POST_BUILD
     COMMAND ${CMAKE_COMMAND} -E copy_directory ${PROJECT_SOURCE_DIR}/resources
             $<TARGET_FILE_DIR:SpaceCheckers>/resources)
-endif()
+endif() 

README.md

@@ -26,7 +26,7 @@ This game can connect to both Private and Public game servers. The Server projec
 - MS Visual Studio 2022 or newer (NOT vscode), with "**Desktop C++ Development**" bundle.
 - Please download "Visual C++ 64bit" edition of SFML; ignore others.
 - Move your unzipped `SFML-2.6.x` folder to its own home, example: `C:/SFML/SFML-2.6.1`.
-- Edit **line 16** in [CMakeLists.txt](CMakeLists.txt), to set value `SFML_HOME` to folder path you moved SFML into (seeprevious step)
+- Edit **line 25** in [CMakeLists.txt](CMakeLists.txt), to set value `SFML_HOME` to folder path you moved SFML into (see previous step)
 
 ### For macOS (x64 & arm64)
 
@@ -38,7 +38,7 @@ This game can connect to both Private and Public game servers. The Server projec
   sudo xcode-select --install
 ```
 
-- After installing the CMake GUI, add its accompanying CLI to PATH by simply run the following command:
+- After installing the CMake GUI, add its accompanying CLI to PATH, simply run the following command:
 
 ```bash
    sudo "/Applications/CMake.app/Contents/bin/cmake-gui" --install

dependencies/libcpr.cmake

@@ -3,8 +3,8 @@
 SET(SSL_OPTION "CPR_FORCE_OPENSSL_BACKEND TRUE")
 if(WIN32)
    SET(SSL_OPTION "CPR_FORCE_WINSSL_BACKEND TRUE")
-elseif(APPLE)
-   SET(SSL_OPTION "CPR_FORCE_DARWINSSL_BACKEND TRUE")
+# elseif(APPLE)
+#    SET(SSL_OPTION "CPR_FORCE_DARWINSSL_BACKEND TRUE")
 endif()
 
 CPMAddPackage(

dependencies/protobuf.cmake

@@ -14,6 +14,5 @@ CPMAddPackage(
   VERSION 30.1
   DOWNLOAD_EXTRACT_TIMESTAMP TRUE
   OPTIONS    "protobuf_BUILD_TESTS OFF" "protobuf_INSTALL OFF" "protobuf_BUILD_PROTOBUF_BINARIES ON"
-   "protobuf_BUILD_LIBUPB OFF" "protobuf_WITH_ZLIB OFF" "protobuf_BUILD_PROTOC_BINARIES OFF" 
-   "protobuf_MSVC_STATIC_RUNTIME OFF"
+   "protobuf_BUILD_LIBUPB OFF" "protobuf_BUILD_PROTOC_BINARIES OFF" "protobuf_MSVC_STATIC_RUNTIME OFF"
 ) 

src/AppVersion.hpp

@@ -0,0 +1,10 @@
+#ifndef APP_VERSION_HPP
+#define APP_VERSION_HPP
+
+// clang-format off
+namespace chk {
+  constexpr const char* APP_VERSION = "1.0.10";
+}
+
+#endif // APP_VERSION_HPP
+// clang-format on

src/MainMenu.hpp

@@ -2,6 +2,7 @@
 // Created by Davis 2024-04-09
 //
 #pragma once
+#include "AppVersion.hpp"
 #include "Piece.hpp"
 #include "utils/ResourcePath.hpp"
 #include <SFML/Graphics/Color.hpp>
@@ -19,7 +20,6 @@ namespace chk
 {
 constexpr auto ICON_PATH = "win-icon-16.png";
 constexpr auto FONT_PATH = "notosans-regular.ttf";
-constexpr auto APP_VERSION = "v1.0.10";
 
 enum class UserChoice
 {

src/proto_schema/AppVersion.hpp.in

@@ -0,0 +1,10 @@
+#ifndef APP_VERSION_HPP
+#define APP_VERSION_HPP
+
+// clang-format off
+namespace chk {
+  constexpr const char* APP_VERSION = "@PROJECT_VERSION@";
+}
+
+#endif // APP_VERSION_HPP
+// clang-format on

src/proto_schema/base_payload.proto

@@ -2,6 +2,9 @@ syntax = "proto3";
 package chk.payload;
 
 option go_package = "checkers-backend/game";
+option java_multiple_files = true;
+option java_package = "com.davistiba.checkers.payloads";
+
 
 message BasePayload {
   // GUI display text from server to client