opentibiabr · dudantas · Oct 29, 2024 · Oct 29, 2024 · Oct 29, 2024 · Oct 29, 2024
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -86,12 +86,15 @@ endif()
 
 option(BUILD_TESTS "Build tests" OFF) # By default, tests will not be built
 option(RUN_TESTS_AFTER_BUILD "Run tests when building" OFF) # By default, tests will only run if requested
+if(PACKAGE_TESTS)
+    set(BUILD_TESTS ON)
+endif()
 
 # *****************************************************************************
 # Add project
 # *****************************************************************************
 add_subdirectory(src)
 
-if(BUILD_TESTS OR PACKAGE_TESTS)
+if(BUILD_TESTS)
     add_subdirectory(tests)
 endif()
diff --git a/cmake/modules/CanaryLib.cmake b/cmake/modules/CanaryLib.cmake
@@ -1,6 +1,10 @@
-# Define and setup CanaryLib main library target
-add_library(${PROJECT_NAME}_lib)
-setup_target(${PROJECT_NAME}_lib)
+set(CANARY_TARGET_NAME ${PROJECT_NAME})
+if(BUILD_TESTS)
+    set(CANARY_TARGET_NAME "${CANARY_TARGET_NAME}_lib")
+    # Define and setup CanaryLib main library target
+    add_library(${CANARY_TARGET_NAME})
+    setup_target(${CANARY_TARGET_NAME})
+endif()
 
 # Add subdirectories
 add_subdirectory(account)
@@ -20,43 +24,43 @@ add_subdirectory(server)
 add_subdirectory(utils)
 
 # Add more global sources - please add preferably in the sub_directory CMakeLists.
-target_sources(${PROJECT_NAME}_lib PRIVATE canary_server.cpp)
+target_sources(${CANARY_TARGET_NAME} PRIVATE canary_server.cpp)
 
 # Conditional Precompiled Headers
 if(USE_PRECOMPILED_HEADER)
-    target_precompile_headers(${PROJECT_NAME}_lib PUBLIC pch.hpp)
-    target_compile_definitions(${PROJECT_NAME}_lib PUBLIC USE_PRECOMPILED_HEADERS)
+    target_precompile_headers(${CANARY_TARGET_NAME} PUBLIC pch.hpp)
+    target_compile_definitions(${CANARY_TARGET_NAME} PUBLIC USE_PRECOMPILED_HEADERS)
 endif()
 
 # *****************************************************************************
 # Build flags - need to be set before the links and sources
 # *****************************************************************************
 if (CMAKE_COMPILER_IS_GNUCXX)
-    target_compile_options(${PROJECT_NAME}_lib PRIVATE -Wno-deprecated-declarations)
+    target_compile_options(${CANARY_TARGET_NAME} PRIVATE -Wno-deprecated-declarations)
 endif()
 
 # Sets the NDEBUG macro for Release and RelWithDebInfo configurations.
-target_compile_definitions(${PROJECT_NAME}_lib PUBLIC
+target_compile_definitions(${CANARY_TARGET_NAME} PUBLIC
         $<$<CONFIG:Release>:NDEBUG>
         $<$<CONFIG:RelWithDebInfo>:NDEBUG>
 )
 
 # Configurar IPO e Linkagem Incremental
-configure_linking(${PROJECT_NAME}_lib)
+configure_linking(${CANARY_TARGET_NAME})
 
 # === UNITY BUILD (compile time reducer) ===
 if(SPEED_UP_BUILD_UNITY)
-    set_target_properties(${PROJECT_NAME}_lib PROPERTIES UNITY_BUILD ON)
-    log_option_enabled("Build unity for speed up compilation for taget ${PROJECT_NAME}_lib")
+    set_target_properties(${CANARY_TARGET_NAME} PROPERTIES UNITY_BUILD ON)
+    log_option_enabled("Build unity for speed up compilation for target ${CANARY_TARGET_NAME}")
 else()
     log_option_disabled("Build unity")
 endif()
 
 # *****************************************************************************
 # Target include directories - to allow #include
 # *****************************************************************************
-target_include_directories(${PROJECT_NAME}_lib
-        PUBLIC
+target_include_directories(${CANARY_TARGET_NAME}
+    PUBLIC
         ${BOOST_DI_INCLUDE_DIRS}
         ${CMAKE_SOURCE_DIR}/src
         ${GMP_INCLUDE_DIRS}
@@ -67,7 +71,7 @@ target_include_directories(${PROJECT_NAME}_lib
 # *****************************************************************************
 # Target links to external dependencies
 # *****************************************************************************
-target_link_libraries(${PROJECT_NAME}_lib
+target_link_libraries(${CANARY_TARGET_NAME}
         PUBLIC
         ${GMP_LIBRARIES}
         ${LUAJIT_LIBRARIES}
@@ -89,7 +93,7 @@ target_link_libraries(${PROJECT_NAME}_lib
 
 if(FEATURE_METRICS)
     add_definitions(-DFEATURE_METRICS)
-    target_link_libraries(${PROJECT_NAME}_lib
+    target_link_libraries(${CANARY_TARGET_NAME}
             PUBLIC
             opentelemetry-cpp::common
             opentelemetry-cpp::metrics
@@ -103,9 +107,9 @@ if(FEATURE_METRICS)
 endif()
 
 if(CMAKE_BUILD_TYPE MATCHES Debug)
-    target_link_libraries(${PROJECT_NAME}_lib PUBLIC ${ZLIB_LIBRARY_DEBUG})
+    target_link_libraries(${CANARY_TARGET_NAME} PUBLIC ${ZLIB_LIBRARY_DEBUG})
 else()
-    target_link_libraries(${PROJECT_NAME}_lib PUBLIC ${ZLIB_LIBRARY_RELEASE})
+    target_link_libraries(${CANARY_TARGET_NAME} PUBLIC ${ZLIB_LIBRARY_RELEASE})
 endif()
 
 if (MSVC)
@@ -114,17 +118,17 @@ if (MSVC)
     else()
         set(VCPKG_TARGET_TRIPLET "x64-windows" CACHE STRING "")
     endif()
-    target_link_libraries(${PROJECT_NAME}_lib PUBLIC ${CMAKE_THREAD_LIBS_INIT} ${MYSQL_CLIENT_LIBS})
+    target_link_libraries(${CANARY_TARGET_NAME} PUBLIC ${CMAKE_THREAD_LIBS_INIT} ${MYSQL_CLIENT_LIBS})
 else()
-    target_link_libraries(${PROJECT_NAME}_lib PUBLIC Threads::Threads)
+    target_link_libraries(${CANARY_TARGET_NAME} PUBLIC Threads::Threads)
 endif()
 
 # === OpenMP ===
 if(OPTIONS_ENABLE_OPENMP)
     log_option_enabled("openmp")
     find_package(OpenMP)
     if(OpenMP_CXX_FOUND)
-        target_link_libraries(${PROJECT_NAME}_lib PUBLIC OpenMP::OpenMP_CXX)
+        target_link_libraries(${CANARY_TARGET_NAME} PUBLIC OpenMP::OpenMP_CXX)
     endif()
 else()
     log_option_disabled("openmp")
@@ -133,8 +137,8 @@ endif()
 # === Optimization Flags ===
 if(CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo" OR CMAKE_BUILD_TYPE STREQUAL "Release")
     if(CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang")
-        target_compile_options(${PROJECT_NAME}_lib PRIVATE -O3 -march=native)
+        target_compile_options(${CANARY_TARGET_NAME} PRIVATE -O3 -march=native)
     elseif(MSVC)
-        target_compile_options(${PROJECT_NAME}_lib PRIVATE /O2)
+        target_compile_options(${CANARY_TARGET_NAME} PRIVATE /O2)
     endif()
 endif()
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -4,28 +4,39 @@ cmake_minimum_required(VERSION 3.22 FATAL_ERROR)
 include(BaseConfig)
 include(GNUInstallDirs)
 
-# Import configurations, source definitions, and linker settings
-include(CanaryLib)
+# If it is tests, we need link it static library
+if (BUILD_TESTS)
+    # Import configurations, source definitions, and linker settings
+    include(CanaryLib)
+endif()
 
 # Define main executable target, set it up and link to main library
 add_executable(${PROJECT_NAME} main.cpp)
 
+# If it is not tests, we can link it directly to the executable
+if (NOT BUILD_TESTS)
+    # Import configurations, source definitions, and linker settings
+    include(CanaryLib)
+endif()
+
 if(MSVC)
     # Add executable icon for Windows
     target_sources(${PROJECT_NAME} PRIVATE ../cmake/canary.rc)
 endif()
 
 setup_target(${PROJECT_NAME})
 set_output_directory(${PROJECT_NAME})
-target_link_libraries(${PROJECT_NAME} PRIVATE ${PROJECT_NAME}_lib)
+if(BUILD_TESTS)
+    target_link_libraries(${PROJECT_NAME} PRIVATE ${CANARY_TARGET_NAME})
+endif(BUILD_TESTS)
 
 # Configurar IPO e Linkagem Incremental para o executável
 configure_linking(${PROJECT_NAME})
 
 # Compiler warnings and options
 if (UNIX)
     if(CMAKE_BUILD_TYPE STREQUAL "Debug")
-        target_compile_options(${PROJECT_NAME}_lib PRIVATE -Wall -Wextra -Wpedantic)
+        target_compile_options(${CANARY_TARGET_NAME} PRIVATE -Wall -Wextra -Wpedantic)
         target_compile_options(${PROJECT_NAME} PRIVATE -Wall -Wextra -Wpedantic)
     endif()
 endif()
diff --git a/src/account/CMakeLists.txt b/src/account/CMakeLists.txt
@@ -1,4 +1,4 @@
-target_sources(${PROJECT_NAME}_lib PRIVATE
+target_sources(${CANARY_TARGET_NAME} PRIVATE
     account.cpp
     account_repository.cpp
     account_repository_db.cpp

diff --git a/src/config/CMakeLists.txt b/src/config/CMakeLists.txt
@@ -1,3 +1,3 @@
-target_sources(${PROJECT_NAME}_lib PRIVATE
+target_sources(${CANARY_TARGET_NAME} PRIVATE
     configmanager.cpp
 )
diff --git a/src/creatures/CMakeLists.txt b/src/creatures/CMakeLists.txt
@@ -1,4 +1,4 @@
-target_sources(${PROJECT_NAME}_lib PRIVATE
+target_sources(${CANARY_TARGET_NAME} PRIVATE
     appearance/mounts/mounts.cpp
     appearance/outfit/outfit.cpp
     combat/combat.cpp

diff --git a/src/database/CMakeLists.txt b/src/database/CMakeLists.txt
@@ -1,4 +1,4 @@
-target_sources(${PROJECT_NAME}_lib PRIVATE
+target_sources(${CANARY_TARGET_NAME} PRIVATE
     database.cpp
     databasemanager.cpp
     databasetasks.cpp

diff --git a/src/game/CMakeLists.txt b/src/game/CMakeLists.txt
@@ -1,4 +1,4 @@
-target_sources(${PROJECT_NAME}_lib PRIVATE
+target_sources(${CANARY_TARGET_NAME} PRIVATE
     functions/game_reload.cpp
     game.cpp
     bank/bank.cpp

diff --git a/src/io/CMakeLists.txt b/src/io/CMakeLists.txt
@@ -1,4 +1,4 @@
-target_sources(${PROJECT_NAME}_lib PRIVATE
+target_sources(${CANARY_TARGET_NAME} PRIVATE
     fileloader.cpp
     filestream.cpp
     io_wheel.cpp

diff --git a/src/items/CMakeLists.txt b/src/items/CMakeLists.txt
@@ -1,4 +1,4 @@
-target_sources(${PROJECT_NAME}_lib PRIVATE
+target_sources(${CANARY_TARGET_NAME} PRIVATE
     bed.cpp
     containers/container.cpp
     containers/depot/depotchest.cpp

diff --git a/src/kv/CMakeLists.txt b/src/kv/CMakeLists.txt
@@ -1,4 +1,4 @@
-target_sources(${PROJECT_NAME}_lib PRIVATE
+target_sources(${CANARY_TARGET_NAME} PRIVATE
     value_wrapper.cpp
     value_wrapper_proto.cpp
     kv.cpp

diff --git a/src/lib/CMakeLists.txt b/src/lib/CMakeLists.txt
@@ -1,10 +1,10 @@
-target_sources(${PROJECT_NAME}_lib PRIVATE
+target_sources(${CANARY_TARGET_NAME} PRIVATE
     di/soft_singleton.cpp
     logging/logger.cpp
     logging/log_with_spd_log.cpp
     thread/thread_pool.cpp
 )
 
 if(FEATURE_METRICS)
-    target_sources(${PROJECT_NAME}_lib PRIVATE metrics/metrics.cpp)
+    target_sources(${CANARY_TARGET_NAME} PRIVATE metrics/metrics.cpp)
 endif()
diff --git a/src/lua/callbacks/CMakeLists.txt b/src/lua/callbacks/CMakeLists.txt
@@ -1,4 +1,4 @@
-target_sources(${PROJECT_NAME}_lib PRIVATE
+target_sources(${CANARY_TARGET_NAME} PRIVATE
     creaturecallback.cpp
     event_callback.cpp
     events_callbacks.cpp

diff --git a/src/lua/creature/CMakeLists.txt b/src/lua/creature/CMakeLists.txt
@@ -1,4 +1,4 @@
-target_sources(${PROJECT_NAME}_lib PRIVATE
+target_sources(${CANARY_TARGET_NAME} PRIVATE
     actions.cpp
     creatureevent.cpp
     events.cpp

diff --git a/src/lua/functions/CMakeLists.txt b/src/lua/functions/CMakeLists.txt
@@ -1,4 +1,4 @@
-target_sources(${PROJECT_NAME}_lib PRIVATE
+target_sources(${CANARY_TARGET_NAME} PRIVATE
     lua_functions_loader.cpp
 )
 

diff --git a/src/lua/functions/core/CMakeLists.txt b/src/lua/functions/core/CMakeLists.txt
@@ -1,4 +1,4 @@
-target_sources(${PROJECT_NAME}_lib PRIVATE
+target_sources(${CANARY_TARGET_NAME} PRIVATE
     game/config_functions.cpp
     game/game_functions.cpp
     game/bank_functions.cpp

diff --git a/src/lua/functions/creatures/CMakeLists.txt b/src/lua/functions/creatures/CMakeLists.txt
@@ -1,4 +1,4 @@
-target_sources(${PROJECT_NAME}_lib PRIVATE
+target_sources(${CANARY_TARGET_NAME} PRIVATE
     combat/combat_functions.cpp
     combat/condition_functions.cpp
     combat/spell_functions.cpp

diff --git a/src/lua/functions/events/CMakeLists.txt b/src/lua/functions/events/CMakeLists.txt
@@ -1,4 +1,4 @@
-target_sources(${PROJECT_NAME}_lib PRIVATE
+target_sources(${CANARY_TARGET_NAME} PRIVATE
     action_functions.cpp
     creature_event_functions.cpp
     event_callback_functions.cpp

diff --git a/src/lua/functions/items/CMakeLists.txt b/src/lua/functions/items/CMakeLists.txt
@@ -1,4 +1,4 @@
-target_sources(${PROJECT_NAME}_lib PRIVATE
+target_sources(${CANARY_TARGET_NAME} PRIVATE
     container_functions.cpp
     imbuement_functions.cpp
     item_classification_functions.cpp

diff --git a/src/lua/functions/map/CMakeLists.txt b/src/lua/functions/map/CMakeLists.txt
@@ -1,4 +1,4 @@
-target_sources(${PROJECT_NAME}_lib PRIVATE
+target_sources(${CANARY_TARGET_NAME} PRIVATE
     house_functions.cpp
     position_functions.cpp
     teleport_functions.cpp

diff --git a/src/lua/global/CMakeLists.txt b/src/lua/global/CMakeLists.txt
@@ -1,4 +1,4 @@
-target_sources(${PROJECT_NAME}_lib PRIVATE
+target_sources(${CANARY_TARGET_NAME} PRIVATE
     baseevents.cpp
     globalevent.cpp
 )
diff --git a/src/lua/modules/CMakeLists.txt b/src/lua/modules/CMakeLists.txt
@@ -1,3 +1,3 @@
-target_sources(${PROJECT_NAME}_lib PRIVATE
+target_sources(${CANARY_TARGET_NAME} PRIVATE
     modules.cpp
 )
diff --git a/src/lua/scripts/CMakeLists.txt b/src/lua/scripts/CMakeLists.txt
@@ -1,4 +1,4 @@
-target_sources(${PROJECT_NAME}_lib PRIVATE
+target_sources(${CANARY_TARGET_NAME} PRIVATE
     lua_environment.cpp
     luascript.cpp
     script_environment.cpp

diff --git a/src/map/CMakeLists.txt b/src/map/CMakeLists.txt
@@ -1,4 +1,4 @@
-target_sources(${PROJECT_NAME}_lib PRIVATE
+target_sources(${CANARY_TARGET_NAME} PRIVATE
     house/house.cpp
     house/housetile.cpp
     utils/astarnodes.cpp

diff --git a/src/protobuf/CMakeLists.txt b/src/protobuf/CMakeLists.txt
@@ -25,8 +25,6 @@ target_link_libraries(${PROJECT_NAME}
 )
 target_include_directories(${PROJECT_NAME} PUBLIC ${CMAKE_CURRENT_BINARY_DIR})
 
-message("Diretório de construção atual: ${CMAKE_CURRENT_BINARY_DIR}")
-
 if (MSVC AND BUILD_STATIC_LIBRARY)
 	set_property(TARGET ${PROJECT_NAME} PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
 endif()

diff --git a/src/security/CMakeLists.txt b/src/security/CMakeLists.txt
@@ -1,4 +1,4 @@
-target_sources(${PROJECT_NAME}_lib PRIVATE
+target_sources(${CANARY_TARGET_NAME} PRIVATE
     argon.cpp
     rsa.cpp
 )
diff --git a/src/server/CMakeLists.txt b/src/server/CMakeLists.txt
@@ -1,4 +1,4 @@
-target_sources(${PROJECT_NAME}_lib PRIVATE
+target_sources(${CANARY_TARGET_NAME} PRIVATE
     network/connection/connection.cpp
     network/message/networkmessage.cpp
     network/message/outputmessage.cpp

diff --git a/src/utils/CMakeLists.txt b/src/utils/CMakeLists.txt
@@ -1,4 +1,4 @@
-target_sources(${PROJECT_NAME}_lib PRIVATE
+target_sources(${CANARY_TARGET_NAME} PRIVATE
     pugicast.cpp
     tools.cpp
     wildcardtree.cpp

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -6,7 +6,7 @@ function(setup_test TARGET_NAME DIR)
     add_executable(${TARGET_NAME} main.cpp)
 
     target_compile_definitions(${TARGET_NAME} PUBLIC -DDEBUG_LOG)
-    target_link_libraries(${TARGET_NAME}  PRIVATE Boost::ut ${PROJECT_NAME}_lib)
+    target_link_libraries(${TARGET_NAME}  PRIVATE Boost::ut ${CANARY_TARGET_NAME})
     target_include_directories(${TARGET_NAME} PRIVATE ${CMAKE_SOURCE_DIR}/tests/fixture PRIVATE ${CMAKE_SOURCE_DIR}/tests/${DIR})
 
     if(SPEED_UP_BUILD_UNITY AND (CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo" OR CMAKE_BUILD_TYPE STREQUAL "Release"))

diff --git a/tests/unit/account/account_test.cpp b/tests/unit/account/account_test.cpp
@@ -6,7 +6,8 @@
  * Contributors: https://github.com/opentibiabr/canary/graphs/contributors
  * Website: https://docs.opentibiabr.com/
  */
+
 #include "pch.hpp"
 
 #include <boost/ut.hpp>