sync depends and cleanup code

Author: fcharlie

AppExec/CMakeLists.txt

@@ -10,10 +10,6 @@ add_executable(
   Appexec.manifest
   Appexec.rc)
 
-if(PRIVEXEC_ENABLE_LTO)
-  set_property(TARGET AppExec PROPERTY INTERPROCEDURAL_OPTIMIZATION TRUE)
-endif()
-
 target_link_libraries(
   AppExec
   Exec

CMakeLists.txt

@@ -14,21 +14,13 @@ This process created the file `CMakeCache.txt' and the directory `CMakeFiles'.
 Please delete them.")
 endif()
 
+option(BUILD_TEST "build test" OFF)
+
 set(CMAKE_C_STANDARD 17)
 set(CMAKE_CXX_STANDARD 23)
 set(CMAKE_CXX_STANDARD_REQUIRED YES)
 
-set(PRIVEXEC_ENABLE_LTO OFF)
-include(CheckIPOSupported)
-check_ipo_supported(RESULT lto_supported OUTPUT error)
-if(lto_supported)
-  message(STATUS "IPO/LTO supported")
-  if(CMAKE_BUILD_TYPE STREQUAL "Release")
-    set(PRIVEXEC_ENABLE_LTO ON)
-    set(BELA_ENABLE_LTO ON)
-    message(STATUS "IPO/LTO enabled")
-  endif()
-endif()
+set(CMAKE_INTERPROCEDURAL_OPTIMIZATION TRUE)
 
 if(MSVC)
   set(CMAKE_MSVC_RUNTIME_LIBRARY_DEFAULT "MultiThreaded$<$<CONFIG:Debug>:Debug>")
@@ -112,6 +104,7 @@ add_subdirectory(lib/exec)
 add_subdirectory(AppExec)
 add_subdirectory(Privexec)
 add_subdirectory(wsudo)
-if(NOT PRIVEXEC_ENABLE_LTO)
+
+if(BUILD_TEST)
   add_subdirectory(test/apc)
-endif()
+endif()

Privexec/CMakeLists.txt

@@ -9,10 +9,6 @@ add_executable(
   Privexec.manifest
   Privexec.rc)
 
-if(PRIVEXEC_ENABLE_LTO)
-  set_property(TARGET Privexec PROPERTY INTERPROCEDURAL_OPTIMIZATION TRUE)
-endif()
-
 target_link_libraries(
   Privexec
   Exec

Privexec/app.hpp

@@ -13,12 +13,12 @@
 #include <PathCch.h>
 #include <string_view>
 #include <vector>
-#include <bela/phmap.hpp>
+#include <gtl/phmap.hpp>
 
 namespace priv {
 
 using wid_t = WELL_KNOWN_SID_TYPE;
-using alias_t = bela::flat_hash_map<std::wstring, std::wstring>;
+using alias_t = gtl::flat_hash_map<std::wstring, std::wstring>;
 std::wstring AppAliasFile();
 bool AppAliasInitialize(HWND hbox, priv::alias_t &alias);
 static constexpr const auto whitecolor = RGB(255, 255, 255);

lib/exec/appcontainer.cc

@@ -3,7 +3,7 @@
 #include <bela/base.hpp>
 #include <bela/codecvt.hpp>
 #include <bela/escapeargv.hpp>
-// #include <bela/phmap.hpp>
+// #include <gtl/phmap.hpp>
 #define PUGIXML_HEADER_ONLY 1
 #include <pugixml.hpp>
 #include <sddl.h>

vendor/bela.lock

@@ -1 +1 @@
-https://github.com/fcharlie/bela/tree/d246bf431c77418bd52995706d3babb23c597a54
+https://github.com/fcharlie/bela/tree/2f4ee32be087c8e56d41121b71f35916edf55d21

vendor/bela/CMakeLists.txt

@@ -16,8 +16,7 @@ This process created the file `CMakeCache.txt' and the directory `CMakeFiles'.
 Please delete them.")
 endif()
 
-option(ENABLE_BELA_TEST "Enable test" OFF)
-option(BELA_ENABLE_LTO "bela enable LTO" OFF)
+option(BUILD_BELA_TEST "Enable test" OFF)
 option(BELA_ENABLE_ASSEMBLY_FILES "bela enable assembly files" OFF)
 
 message(STATUS "CMAKE_ASM_COMPILER_ID ${CMAKE_ASM_COMPILER_ID}")
@@ -31,6 +30,7 @@ if(CMAKE_CXX_STANDARD LESS 23 OR CMAKE_CXX_STANDARD STREQUAL "98")
 endif()
 
 set(CMAKE_CXX_STANDARD_REQUIRED YES)
+set(CMAKE_INTERPROCEDURAL_OPTIMIZATION TRUE)
 
 if("^${CMAKE_SOURCE_DIR}$" STREQUAL "^${PROJECT_SOURCE_DIR}$")
   set(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
@@ -61,6 +61,6 @@ add_subdirectory(src/belatime)
 add_subdirectory(src/belaund)
 add_subdirectory(src/belahash)
 add_subdirectory(src/hazel)
-if(ENABLE_BELA_TEST)
+if(BUILD_BELA_TEST)
   add_subdirectory(test)
 endif()

vendor/bela/CMakeSettings.json

@@ -7,7 +7,7 @@
       "inheritEnvironments": [ "msvc_x64_x64" ],
       "buildRoot": "${projectDir}\\out\\build\\${name}",
       "installRoot": "${projectDir}\\out\\install\\${name}",
-      "cmakeCommandArgs": "-DENABLE_BELA_TEST=ON",
+      "cmakeCommandArgs": "-DBUILD_BELA_TEST=ON",
       "buildCommandArgs": "",
       "ctestCommandArgs": "",
       "variables": []

vendor/bela/README.md

@@ -3,7 +3,7 @@
 [![license badge](https://img.shields.io/github/license/fcharlie/bela.svg)](LICENSE)
 [![Master Branch Status](https://github.com/fcharlie/bela/workflows/BelaCI/badge.svg)](https://github.com/fcharlie/bela/actions)
 
-Modern C++23 library collection, better development experience on Windows (10,11)
+Modern C++23 library collection, better development experience on Windows 11
 
 A lot of the code supports wchar_t based on Abseil modifications, some of which come from Visual C++ STL.
 

vendor/bela/build.ps1

@@ -122,7 +122,7 @@ catch {
 }
 $env:CC = "cl"
 $env:CXX = "cl"
-$ExitCode = Execute -FilePath "cmake" -WD $WD -Arguments "-GNinja -DCMAKE_BUILD_TYPE=Release -DENABLE_BELA_TEST=ON .."
+$ExitCode = Execute -FilePath "cmake" -WD $WD -Arguments "-GNinja -DCMAKE_BUILD_TYPE=Release -DBUILD_BELA_TEST=ON .."
 if ($ExitCode -ne 0) {
     exit $ExitCode
 }