Merge pull request #497 from aregtech/feature/496-integrate-areglogger-to-lusan-tool-project

496 integrate areglogger to lusan tool project

Author: aregtech

conf/cmake/common.cmake

@@ -179,13 +179,23 @@ if (AREG_ENABLE_OUTPUTS)
 
 else()
 
+    # The build root directory
+    if (NOT DEFINED AREG_BUILD_ROOT OR "${AREG_BUILD_ROOT}" STREQUAL "")
+        set(AREG_BUILD_ROOT "${CMAKE_BINARY_DIR}")
+    endif()
+
     # The output directory
     if (NOT DEFINED AREG_OUTPUT_DIR OR "${AREG_OUTPUT_DIR}" STREQUAL "")
         set(AREG_OUTPUT_DIR "${AREG_BUILD_ROOT}")
     endif()
 
 endif()
 
+# The directory to output generated files
+if ("${AREG_GENERATE_DIR}" STREQUAL "")
+    set(AREG_GENERATE_DIR "${AREG_BUILD_ROOT}/${AREG_GENERATE}")
+endif()
+
 # The directory to output static libraries
 if (NOT DEFINED AREG_OUTPUT_LIB OR "${AREG_OUTPUT_LIB}" STREQUAL "")
     # set absolute path to AREG_OUTPUT_LIB if it is not manually set

conf/cmake/setup.cmake

@@ -55,11 +55,31 @@ if (NOT DEFINED AREG_SDK_TOOLS OR "${AREG_SDK_TOOLS}" STREQUAL "")
     set(AREG_SDK_TOOLS			"${AREG_SDK_ROOT}/tools")
 endif()
 
+if (NOT DEFINED AREG_ENABLE_OUTPUTS OR AREG_ENABLE_OUTPUTS)
+    option(AREG_ENABLE_OUTPUTS "Enable changing output directories" TRUE)
+    # Set the areg-sdk build root folder to output files.
+    if (NOT DEFINED AREG_BUILD_ROOT OR "${AREG_BUILD_ROOT}" STREQUAL "")
+        set(AREG_BUILD_ROOT "${AREG_SDK_ROOT}/product")
+    endif()
+
+    if (NOT DEFINED AREG_PACKAGES OR "${AREG_PACKAGES}" STREQUAL "")
+        set(AREG_PACKAGES "${CMAKE_BINARY_DIR}/packages")
+    endif()
+else()
+    option(AREG_ENABLE_OUTPUTS "Enable changing output directories" FALSE)
+    if (NOT DEFINED AREG_BUILD_ROOT OR "${AREG_BUILD_ROOT}" STREQUAL "")
+        set(AREG_BUILD_ROOT "${CMAKE_BINARY_DIR}")
+    endif()
+endif()
+
 # setup functions
 include(${AREG_CMAKE_CONFIG_DIR}/functions.cmake)
 # setup user configurations
 include(${AREG_CMAKE_CONFIG_DIR}/user.cmake)
 
+# CPP standard for the projects
+set(AREG_CXX_STANDARD 17)
+
 # Check whether the CMake CXX-compiler is set
 if (NOT "${AREG_CXX_COMPILER}" STREQUAL "")
     if ("${CMAKE_CXX_COMPILER}" STREQUAL "")
@@ -80,7 +100,7 @@ if (NOT "${AREG_C_COMPILER}" STREQUAL "")
     endif()
 endif()
 
-if (WIN32)
+if (MSVC AND NOT "${CMAKE_GENERATOR}" STREQUAL "Ninja")
 
     if ("${AREG_COMPILER_FAMILY}" STREQUAL "llvm")
         set(CMAKE_GENERATOR_TOOLSET ClangCL CACHE INTERNAL "Force ClangCL tool-set")
@@ -97,6 +117,11 @@ endif()
 # check and fix CXX standard for AREG Framework sources.
 macro_check_fix_areg_cxx_standard()
 
+# The relative path for generated files
+if ("${AREG_GENERATE}" STREQUAL "")
+    set(AREG_GENERATE "generate")
+endif()
+
 if (NOT "${AREG_PACKAGES}" STREQUAL "")
     set(FETCHCONTENT_BASE_DIR   "${AREG_PACKAGES}" CACHE PATH "Location of AREG thirdparty packages")
 else()

conf/cmake/user.cmake

@@ -282,31 +282,3 @@ else()
     macro_create_option(AREG_INSTALL           OFF "Enable installation")
 endif()
 
-# CPP standard for the projects
-set(AREG_CXX_STANDARD 17)
-
-if (NOT DEFINED AREG_ENABLE_OUTPUTS OR AREG_ENABLE_OUTPUTS)
-    option(AREG_ENABLE_OUTPUTS "Enable changing output directories" TRUE)
-    # Set the areg-sdk build root folder to output files.
-    if (NOT DEFINED AREG_BUILD_ROOT OR "${AREG_BUILD_ROOT}" STREQUAL "")
-        set(AREG_BUILD_ROOT "${AREG_SDK_ROOT}/product")
-    endif()
-
-    if (NOT DEFINED AREG_PACKAGES OR "${AREG_PACKAGES}" STREQUAL "")
-        set(AREG_PACKAGES "${CMAKE_BINARY_DIR}/packages")
-    endif()
-else()
-    option(AREG_ENABLE_OUTPUTS "Enable changing output directories" FALSE)
-    if (NOT DEFINED AREG_BUILD_ROOT OR "${AREG_BUILD_ROOT}" STREQUAL "")
-        set(AREG_BUILD_ROOT "${CMAKE_BINARY_DIR}")
-    endif()
-endif()
-
-# The relative path for generated files
-if ("${AREG_GENERATE}" STREQUAL "")
-    set(AREG_GENERATE "generate")
-endif()
-
-if ("${AREG_GENERATE_DIR}" STREQUAL "")
-    set(AREG_GENERATE_DIR "${AREG_BUILD_ROOT}/${AREG_GENERATE}")
-endif()