update following the pull request review

Author: Milerius

BUILD_INSTRUCTIONS.md

@@ -1,18 +1,17 @@
 Linux:
 
-CMake 3.9 is required.
-
-- a valid installation of gtest is required on your computer:
+- CMake 3.9 is required.
+- a valid installation of gtest is required on your computer
 
 ```bash
 ## Debug / Release
 mkdir build
 cd build
-cmake -DMAGMA_BUILD_TESTS=ON -DCMAKE_BUILD_TYPE="Debug" ..
-make -j
+cmake -DMAGMA_BUILD_TESTS=ON -DCMAKE_BUILD_TYPE=Debug ..
+make
 
 ##! installation
-sudo make install -j
+sudo make install
 
 ##! unit tests
 cd build

CMakeLists.txt

@@ -36,50 +36,50 @@ endif ()
 ##! Main library
 add_library(magma INTERFACE)
 
-if(NOT DEFINED ENV{CLAWS_ROOT_DEV})
-  message(STATUS "using insalled version of claws")
-  find_package(claws CONFIG REQUIRED)
-else()
-  message(STATUS "using development version of claws")
-  add_subdirectory($ENV{CLAWS_ROOT_DEV} build)
-endif() 
+if (NOT DEFINED ENV{CLAWS_ROOT_DEV})
+    message(STATUS "using insalled version of claws")
+    find_package(claws CONFIG REQUIRED)
+else ()
+    message(STATUS "using development version of claws")
+    add_subdirectory($ENV{CLAWS_ROOT_DEV} build)
+endif ()
 
 target_link_libraries(magma INTERFACE
-  magma::render
-  claws::utils)
+        magma::render
+        claws::utils)
 
 if (NOT IDE_BUILD)
-  include(GNUInstallDirs)
-  include(CMakePackageConfigHelpers)
-  install(TARGETS
-    magma
-    EXPORT magma-targets
-    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
-    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-    INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
-    )
-
-  install(DIRECTORY
-    ${CMAKE_CURRENT_SOURCE_DIR}/modules/magma
-    DESTINATION
-    ${CMAKE_INSTALL_INCLUDEDIR}
-    FILES_MATCHING PATTERN "*.h*"
-    )
-
-  install(EXPORT magma-targets
-    FILE magma-targets.cmake
-    NAMESPACE magma::
-    DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/magma
-    )
-
-  configure_package_config_file(
-    "${PROJECT_SOURCE_DIR}/cmake/magma-config.cmake.in"
-    "${PROJECT_BINARY_DIR}/magma-config.cmake"
-    INSTALL_DESTINATION lib/cmake/magma
+    include(GNUInstallDirs)
+    include(CMakePackageConfigHelpers)
+    install(TARGETS
+            magma
+            EXPORT magma-targets
+            RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+            ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+            LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+            INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
+            )
+
+    install(DIRECTORY
+            ${CMAKE_CURRENT_SOURCE_DIR}/modules/magma
+            DESTINATION
+            ${CMAKE_INSTALL_INCLUDEDIR}
+            FILES_MATCHING PATTERN "*.hpp"
+            )
+
+    install(EXPORT magma-targets
+            FILE magma-targets.cmake
+            NAMESPACE magma::
+            DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/magma
+            )
+
+    configure_package_config_file(
+            "${PROJECT_SOURCE_DIR}/cmake/magma-config.cmake.in"
+            "${PROJECT_BINARY_DIR}/magma-config.cmake"
+            INSTALL_DESTINATION lib/cmake/magma
     )
 
-  install(FILES
-    "${PROJECT_BINARY_DIR}/magma-config.cmake"
-    DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/magma)
-endif()
+    install(FILES
+            "${PROJECT_BINARY_DIR}/magma-config.cmake"
+            DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/magma)
+endif ()

cmake/compiler.cmake

@@ -14,11 +14,11 @@ if (UNIX)
     set(STANDARD_UNIX_CXX_FLAGS "-Wall -Wextra -Wfatal-errors -Wno-unknown-pragmas")
     if (CLANG)
         set(STANDARD_UNIX_CXX_FLAGS "${STANDARD_UNIX_CXX_FLAGS} -Weverything -Wno-exit-time-destructors -Wno-covered-switch-default -Wno-documentation-unknown-command -Wno-gnu-zero-variadic-macro-arguments -Wno-global-constructors -Wno-newline-eof -Wno-reserved-id-macro -Wno-deprecated -Wno-padded -Wno-c++98-compat-pedantic -Wno-c++98-compat -Wno-weak-vtables")
-    endif()
-elseif(MSVC)
+    endif ()
+elseif (MSVC)
     set(STANDARD_MSVC_CXX_FLAGS "/std:c++latest /W4 /permissive- /wd4068")
     add_definitions(-DNOMINMAX)
-endif()
+endif ()
 
 ##! Internal Debug configuration
 macro(__internal_debug_unix_cxx_flags)
@@ -32,9 +32,9 @@ endmacro()
 macro(__internal_debug_cxx_flags)
     if (CLANG OR GCC)
         __internal_debug_unix_cxx_flags()
-    elseif(MSVC)
+    elseif (MSVC)
         __internal_debug_msvc_cxx_flags()
-    endif()
+    endif ()
 endmacro()
 
 ##! Internal Release configuration
@@ -49,18 +49,18 @@ endmacro()
 macro(__internal_release_cxx_flags)
     if (CLANG OR GCC)
         __internal_release_unix_cxx_flags()
-    elseif(MSVC)
+    elseif (MSVC)
         __internal_release_msvc_cxx_flags()
-    endif()
+    endif ()
 endmacro()
 
 ##! Compiler Configuration.
-if(CMAKE_BUILD_TYPE MATCHES Debug)
+if (CMAKE_BUILD_TYPE MATCHES Debug)
     add_definitions(-DDEBUG)
     __internal_debug_cxx_flags()
     MSG_YELLOW_BOLD(STATUS "CMAKE_CXX_FLAGS_DEBUG:" "${CMAKE_CXX_FLAGS_DEBUG}" "")
-elseif(CMAKE_BUILD_TYPE MATCHES Release)
+elseif (CMAKE_BUILD_TYPE MATCHES Release)
     add_definitions(-DRELEASE)
     __internal_release_cxx_flags()
     MSG_YELLOW_BOLD(STATUS "CMAKE_CXX_FLAGS_RELEASE:" "${CMAKE_CXX_FLAGS_RELEASE}" "")
-endif()
+endif ()

cmake/library.cmake

@@ -2,7 +2,7 @@ option(TEST_CMAKE_PERSONAL_FEATURES "test personal cmake features" OFF)
 
 if (TEST_CMAKE_PERSONAL_FEATURES)
     include(${CMAKE_MODULE_PATH}/test_features.cmake)
-endif()
+endif ()
 
 include(buildtype)
 include(color)

cmake/platform.cmake

@@ -10,4 +10,4 @@ elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Intel")
     set(ICC TRUE)
 elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
     set(MSVC TRUE)
-endif()
+endif ()

cmake/unit_tests.cmake

@@ -9,7 +9,7 @@ macro(__internal_specific_unit_test_platform_configuration EXECUTABLE_NAME)
     endif (WIN32)
     if (CLANG)
         set_target_properties(${EXECUTABLE_NAME} PROPERTIES COMPILE_FLAGS "${CMAKE_CXX_FLAGS} -Wno-global-constructors")
-    endif()
+    endif ()
 endmacro()
 
 macro(__internal_specific_unit_test_properties EXECUTABLE_NAME)
@@ -34,7 +34,5 @@ macro(CREATE_UNIT_TEST EXECUTABLE_NAME PREFIX_NAME SOURCES)
     target_link_libraries(${EXECUTABLE_NAME} GTest::GTest GTest::Main)
     __internal_specific_unit_test_platform_configuration(${EXECUTABLE_NAME})
     __internal_specific_unit_test_properties(${EXECUTABLE_NAME})
-    if (NOT EMSCRIPTEN)
-        gtest_discover_tests(${EXECUTABLE_NAME} WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/bin TEST_PREFIX ${PREFIX_NAME} TIMEOUT 5)
-    endif()
+    gtest_discover_tests(${EXECUTABLE_NAME} WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/bin TEST_PREFIX ${PREFIX_NAME} TIMEOUT 5)
 endmacro()