Merge pull request #182 from aegoroff:develop

ci: pcre linking removed from hc project because it's not needed
aegoroff · Feb 21, 2024 · e4adc30 · e4adc30
2 parents b5ba365 + 2c2ee3f
commit e4adc30
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 13 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -369,11 +369,11 @@ if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
         PRIVATE strsafe
         PRIVATE libcrypto)
 else ()
-    target_link_libraries(libhc INTERFACE m INTERFACE libapr-1.a INTERFACE libaprutil-1.a INTERFACE libpcre2-8.a INTERFACE crypto)
+    target_link_libraries(libhc INTERFACE m INTERFACE libapr-1.a INTERFACE libaprutil-1.a INTERFACE crypto)
 endif ()
 target_link_libraries(hc PRIVATE libhc PRIVATE tomcypt)
-target_link_libraries(l2h PRIVATE libhc PRIVATE tomcypt)
-target_link_libraries(_tst PRIVATE libhc PRIVATE tomcypt)
+target_link_libraries(l2h PRIVATE libhc PRIVATE tomcypt PRIVATE libpcre2-8.a)
+target_link_libraries(_tst PRIVATE libhc PRIVATE tomcypt PRIVATE libpcre2-8.a)
 
 target_link_options(libhc PRIVATE "-static")
 target_link_options(hc PRIVATE "-static-libgcc" "-static-libstdc++")

diff --git a/src/_tst/_tst.vcxproj b/src/_tst/_tst.vcxproj
@@ -62,7 +62,7 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(SolutionDir)srclib;$(APR_HOME16)\apr\include;$(APR_HOME16)\apr-util\include;$(SolutionDir)l2h;$(SolutionDir)l2h\generated;$(SolutionDir)pcre;$(ProjectDir);$(SolutionDir)libtomcrypt\src\headers;$(ProjectDir)..\..\external_lib\pcre\include;$(ProjectDir)..\..\external_lib\openssl\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)srclib;$(APR_HOME16)\apr\include;$(APR_HOME16)\apr-util\include;$(SolutionDir)l2h;$(SolutionDir)l2h\generated;$(ProjectDir);$(SolutionDir)libtomcrypt\src\headers;$(ProjectDir)..\..\external_lib\pcre\include;$(ProjectDir)..\..\external_lib\openssl\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;USE_KECCAK;_SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING;_DEBUG;_CONSOLE;APR_DECLARE_STATIC;APU_DECLARE_STATIC;GTEST;_VARIADIC_MAX=10;SPH_64;YYERROR_VERBOSE;PCRE2_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>false</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -97,7 +97,7 @@
       <Optimization>Full</Optimization>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
-      <AdditionalIncludeDirectories>$(SolutionDir)srclib;$(APR_HOME16)\apr\include;$(APR_HOME16)\apr-util\include;$(SolutionDir)l2h;$(SolutionDir)l2h\generated;$(SolutionDir)pcre;$(ProjectDir);$(SolutionDir)libtomcrypt\src\headers;$(ProjectDir)..\..\external_lib\pcre\include;$(ProjectDir)..\..\external_lib\openssl\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)srclib;$(APR_HOME16)\apr\include;$(APR_HOME16)\apr-util\include;$(SolutionDir)l2h;$(SolutionDir)l2h\generated;$(ProjectDir);$(SolutionDir)libtomcrypt\src\headers;$(ProjectDir)..\..\external_lib\pcre\include;$(ProjectDir)..\..\external_lib\openssl\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;USE_KECCAK;_SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING;NDEBUG;_CONSOLE;APR_DECLARE_STATIC;APU_DECLARE_STATIC;GTEST;_VARIADIC_MAX=10;SPH_64;YYERROR_VERBOSE;PCRE2_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>

diff --git a/src/hc/hc.vcxproj b/src/hc/hc.vcxproj
@@ -56,8 +56,8 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(APR_HOME16)\apr\include;$(APR_HOME16)\apr-util\include;$(ProjectDir);$(ProjectDir)..\..\include;$(ProjectDir)..\pcre;$(ProjectDir)\output;$(ProjectDir)..\libtomcrypt\src\headers;$(ProjectDir)..\l2h;$(SolutionDir)srclib;$(ProjectDir)include;$(ProjectDir)..\..\external_lib\pcre\include;$(ProjectDir)..\..\external_lib\openssl\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;USE_KECCAK;_DEBUG;_CONSOLE;APR_DECLARE_STATIC;APU_DECLARE_STATIC;PCRE2_STATIC;SPH_64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(APR_HOME16)\apr\include;$(APR_HOME16)\apr-util\include;$(ProjectDir);$(ProjectDir)..\..\include;$(ProjectDir)\output;$(ProjectDir)..\libtomcrypt\src\headers;$(ProjectDir)..\l2h;$(SolutionDir)srclib;$(ProjectDir)include;$(ProjectDir)..\..\external_lib\openssl\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;USE_KECCAK;_DEBUG;_CONSOLE;APR_DECLARE_STATIC;APU_DECLARE_STATIC;SPH_64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <PrecompiledHeader>
@@ -76,8 +76,8 @@
       <UseStandardPreprocessor>true</UseStandardPreprocessor>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>cudart_static.lib;Ws2_32.lib;rpcrt4.lib;pcre2-8-static.lib;apr-1.lib;aprutil-1.lib;libtomcrypt.lib;strsafe.lib;libcrypto.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(APR_HOME16)\apr\x64\Debug;$(APR_HOME16)\apr-util\x64\Debug;$(APR_HOME16)\apr\lib;$(ProjectDir)..\x64\$(Configuration);$(ProjectDir)..\..\External\openssl\x64;$(ProjectDir)..\..\external_lib\openssl\lib;$(ProjectDir)..\..\External\libintl\x64\$(Configuration);$(ProjectDir)..\..\external_lib\pcre\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>cudart_static.lib;Ws2_32.lib;rpcrt4.lib;apr-1.lib;aprutil-1.lib;libtomcrypt.lib;strsafe.lib;libcrypto.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>$(APR_HOME16)\apr\x64\Debug;$(APR_HOME16)\apr-util\x64\Debug;$(APR_HOME16)\apr\lib;$(ProjectDir)..\x64\$(Configuration);$(ProjectDir)..\..\External\openssl\x64;$(ProjectDir)..\..\external_lib\openssl\lib;$(ProjectDir)..\..\External\libintl\x64\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <TargetMachine>MachineX64</TargetMachine>
@@ -99,8 +99,8 @@
       <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
-      <AdditionalIncludeDirectories>$(APR_HOME16)\apr\include;$(APR_HOME16)\apr-util\include;$(ProjectDir);$(ProjectDir)..\..\include;$(ProjectDir)..\pcre;$(ProjectDir)\output;$(ProjectDir)..\libtomcrypt\src\headers;$(ProjectDir)..\l2h;$(SolutionDir)srclib;$(ProjectDir)include;$(ProjectDir)..\..\external_lib\pcre\include;$(ProjectDir)..\..\external_lib\openssl\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;USE_KECCAK;NDEBUG;_CONSOLE;APR_DECLARE_STATIC;APU_DECLARE_STATIC;PCRE2_STATIC;SPH_64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(APR_HOME16)\apr\include;$(APR_HOME16)\apr-util\include;$(ProjectDir);$(ProjectDir)..\..\include;$(ProjectDir)\output;$(ProjectDir)..\libtomcrypt\src\headers;$(ProjectDir)..\l2h;$(SolutionDir)srclib;$(ProjectDir)include;$(ProjectDir)..\..\external_lib\openssl\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;USE_KECCAK;NDEBUG;_CONSOLE;APR_DECLARE_STATIC;APU_DECLARE_STATIC;SPH_64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <ExceptionHandling>
       </ExceptionHandling>
@@ -128,8 +128,8 @@
       <UseStandardPreprocessor>true</UseStandardPreprocessor>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>cudart_static.lib;Ws2_32.lib;rpcrt4.lib;pcre2-8-static.lib;apr-1.lib;aprutil-1.lib;libtomcrypt.lib;libcrypto.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(APR_HOME16)\apr\x64\Release;$(APR_HOME16)\apr-util\x64\Release;$(APR_HOME16)\apr\lib;$(ProjectDir)..\x64\$(Configuration);$(ProjectDir)..\..\External\openssl\x64;$(ProjectDir)..\..\external_lib\openssl\lib;$(ProjectDir)..\..\External\libintl\x64\$(Configuration);$(ProjectDir)..\..\external_lib\pcre\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>cudart_static.lib;Ws2_32.lib;rpcrt4.lib;apr-1.lib;aprutil-1.lib;libtomcrypt.lib;libcrypto.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>$(APR_HOME16)\apr\x64\Release;$(APR_HOME16)\apr-util\x64\Release;$(APR_HOME16)\apr\lib;$(ProjectDir)..\x64\$(Configuration);$(ProjectDir)..\..\External\openssl\x64;$(ProjectDir)..\..\external_lib\openssl\lib;$(ProjectDir)..\..\External\libintl\x64\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>DebugFull</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>