Skip to content

Commit

Permalink
Fix bcrypt dependency of libxml2
Browse files Browse the repository at this point in the history
  • Loading branch information
@beutlich
beutlich committed Jan 6, 2025
1 parent 1df44fc commit 97401f2
Show file tree
Hide file tree
Showing 7 changed files with 16 additions and 21 deletions.
1 change: 1 addition & 0 deletions ExternData/Resources/BuildProjects/CMake/test.cmake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ if(EXISTS "${ED_TEST_DIR}")
xlsreader
xml2
zlib
bcrypt
gtest
)
if(UNIX)
Expand Down
14 changes: 4 additions & 10 deletions ExternData/Resources/BuildProjects/VisualStudio2010/ED_XML2File.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@
<GenerateDebugInformation>true</GenerateDebugInformation>
<ModuleDefinitionFile>ED_XML2File.def</ModuleDefinitionFile>
<AdditionalLibraryDirectories>$(SolutionDir)$(Configuration)\;$(SolutionDir)..\..\thirdParty\ITI\win32\</AdditionalLibraryDirectories>
<AdditionalDependencies>bcrypt.lib;xml2.lib;zlib.lib;ModelicaExternalC.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>xml2.lib;zlib.lib;bcrypt.lib;ModelicaExternalC.lib;%(AdditionalDependencies)</AdditionalDependencies>
<ImportLibrary>$(SolutionDir)$(Configuration)\$(ProjectName).lib</ImportLibrary>
</Link>
</ItemDefinitionGroup>
Expand All @@ -140,7 +140,7 @@
<GenerateDebugInformation>true</GenerateDebugInformation>
<ModuleDefinitionFile>ED_XML2File.def</ModuleDefinitionFile>
<AdditionalLibraryDirectories>$(SolutionDir)$(Platform)\$(Configuration)\;$(SolutionDir)..\..\thirdParty\ITI\win64\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalDependencies>bcrypt.lib;xml2.lib;zlib.lib;ModelicaExternalC.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>xml2.lib;zlib.lib;bcrypt.lib;ModelicaExternalC.lib;%(AdditionalDependencies)</AdditionalDependencies>
<ImportLibrary>$(SolutionDir)$(Platform)\$(Configuration)\$(ProjectName).lib</ImportLibrary>
</Link>
</ItemDefinitionGroup>
Expand All @@ -156,7 +156,7 @@
</ClCompile>
<Link>
<ModuleDefinitionFile>ED_XML2File.def</ModuleDefinitionFile>
<AdditionalDependencies>bcrypt.lib;xml2.lib;zlib.lib;ModelicaExternalC.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>xml2.lib;zlib.lib;bcrypt.lib;ModelicaExternalC.lib;%(AdditionalDependencies)</AdditionalDependencies>
<SubSystem>Windows</SubSystem>
<AdditionalLibraryDirectories>$(SolutionDir)$(Configuration)\;$(SolutionDir)..\..\thirdParty\ITI\win32\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<ImportLibrary>$(SolutionDir)$(Configuration)\$(ProjectName).lib</ImportLibrary>
Expand All @@ -175,7 +175,7 @@
</ClCompile>
<Link>
<ModuleDefinitionFile>ED_XML2File.def</ModuleDefinitionFile>
<AdditionalDependencies>bcrypt.lib;xml2.lib;zlib.lib;ModelicaExternalC.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>xml2.lib;zlib.lib;bcrypt.lib;ModelicaExternalC.lib;%(AdditionalDependencies)</AdditionalDependencies>
<SubSystem>Windows</SubSystem>
<AdditionalLibraryDirectories>$(SolutionDir)$(Platform)\$(Configuration)\;$(SolutionDir)..\..\thirdParty\ITI\win64\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<ImportLibrary>$(SolutionDir)$(Platform)\$(Configuration)\$(ProjectName).lib</ImportLibrary>
Expand Down Expand Up @@ -205,9 +205,6 @@
<AdditionalLibraryDirectories>$(SolutionDir)$(Configuration)\;$(SolutionDir)..\..\thirdParty\ITI\win32\</AdditionalLibraryDirectories>
</Link>
<Lib />
<Lib>
<AdditionalDependencies>bcrypt.lib</AdditionalDependencies>
</Lib>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release Lib|x64'">
<ClCompile>
Expand All @@ -230,9 +227,6 @@
<AdditionalLibraryDirectories>$(SolutionDir)$(Configuration)\;$(SolutionDir)..\..\thirdParty\ITI\win32\</AdditionalLibraryDirectories>
</Link>
<Lib />
<Lib>
<AdditionalDependencies>bcrypt.lib</AdditionalDependencies>
</Lib>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\..\C-Sources\ED_XML2File.c" />
Expand Down
Binary file added ExternData/Resources/Library/linux32/libbcrypt.a
View file
Binary file not shown.
Binary file added ExternData/Resources/Library/linux64/libbcrypt.a
View file
Binary file not shown.
Binary file modified ExternData/Resources/Library/win32/ED_XML2File.lib
View file
Binary file not shown.
Binary file modified ExternData/Resources/Library/win64/ED_XML2File.lib
View file
Binary file not shown.
22 changes: 11 additions & 11 deletions ExternData/package.mo
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1302,7 +1302,7 @@ package ExternData "Library for data I/O of CSV, INI, JSON, MATLAB MAT, SSV, TIR
__iti_dll = "ITI_ED_XML2File.dll",
__iti_dllNoExport = true,
Include = "#include \"ED_XML2File.h\"",
Library = {"ED_XML2File", "xml2", "zlib"});
Library = {"ED_XML2File", "xml2", "zlib", "bcrypt"});
end getReal;

pure function getRealArray1D "Get 1D Real values from XML file"
Expand All @@ -1311,7 +1311,7 @@ package ExternData "Library for data I/O of CSV, INI, JSON, MATLAB MAT, SSV, TIR
__iti_dll = "ITI_ED_XML2File.dll",
__iti_dllNoExport = true,
Include = "#include \"ED_XML2File.h\"",
Library = {"ED_XML2File", "xml2", "zlib"});
Library = {"ED_XML2File", "xml2", "zlib", "bcrypt"});
end getRealArray1D;

pure function getRealArray2D "Get 2D Real values from XML file"
Expand All @@ -1320,7 +1320,7 @@ package ExternData "Library for data I/O of CSV, INI, JSON, MATLAB MAT, SSV, TIR
__iti_dll = "ITI_ED_XML2File.dll",
__iti_dllNoExport = true,
Include = "#include \"ED_XML2File.h\"",
Library = {"ED_XML2File", "xml2", "zlib"});
Library = {"ED_XML2File", "xml2", "zlib", "bcrypt"});
end getRealArray2D;

pure function getInteger "Get scalar Integer value from XML file"
Expand All @@ -1329,7 +1329,7 @@ package ExternData "Library for data I/O of CSV, INI, JSON, MATLAB MAT, SSV, TIR
__iti_dll = "ITI_ED_XML2File.dll",
__iti_dllNoExport = true,
Include = "#include \"ED_XML2File.h\"",
Library = {"ED_XML2File", "xml2", "zlib"});
Library = {"ED_XML2File", "xml2", "zlib", "bcrypt"});
end getInteger;

pure function getBoolean "Get scalar Boolean value from XML file"
Expand All @@ -1346,7 +1346,7 @@ package ExternData "Library for data I/O of CSV, INI, JSON, MATLAB MAT, SSV, TIR
__iti_dll = "ITI_ED_XML2File.dll",
__iti_dllNoExport = true,
Include = "#include \"ED_XML2File.h\"",
Library = {"ED_XML2File", "xml2", "zlib"});
Library = {"ED_XML2File", "xml2", "zlib", "bcrypt"});
end getString;

pure function getArraySize1D "Get length of 1D array in XML file"
Expand All @@ -1355,7 +1355,7 @@ package ExternData "Library for data I/O of CSV, INI, JSON, MATLAB MAT, SSV, TIR
__iti_dll = "ITI_ED_XML2File.dll",
__iti_dllNoExport = true,
Include = "#include \"ED_XML2File.h\"",
Library = {"ED_XML2File", "xml2", "zlib"});
Library = {"ED_XML2File", "xml2", "zlib", "bcrypt"});
end getArraySize1D;

pure function getArraySize2D "Get dimensions of 2D array in XML file"
Expand All @@ -1364,7 +1364,7 @@ package ExternData "Library for data I/O of CSV, INI, JSON, MATLAB MAT, SSV, TIR
__iti_dll = "ITI_ED_XML2File.dll",
__iti_dllNoExport = true,
Include = "#include \"ED_XML2File.h\"",
Library = {"ED_XML2File", "xml2", "zlib"});
Library = {"ED_XML2File", "xml2", "zlib", "bcrypt"});
end getArraySize2D;

pure function getArrayRows2D "Get first dimension of 2D array in XML file"
Expand All @@ -1373,7 +1373,7 @@ package ExternData "Library for data I/O of CSV, INI, JSON, MATLAB MAT, SSV, TIR
__iti_dll = "ITI_ED_XML2File.dll",
__iti_dllNoExport = true,
Include = "#include \"ED_XML2File.h\"",
Library = {"ED_XML2File", "xml2", "zlib"});
Library = {"ED_XML2File", "xml2", "zlib", "bcrypt"});
end getArrayRows2D;

pure function getArrayColumns2D "Get second dimension of 2D array in XML file"
Expand All @@ -1382,7 +1382,7 @@ package ExternData "Library for data I/O of CSV, INI, JSON, MATLAB MAT, SSV, TIR
__iti_dll = "ITI_ED_XML2File.dll",
__iti_dllNoExport = true,
Include = "#include \"ED_XML2File.h\"",
Library = {"ED_XML2File", "xml2", "zlib"});
Library = {"ED_XML2File", "xml2", "zlib", "bcrypt"});
end getArrayColumns2D;

function readArraySize1D "Read length of 1D array in XML file"
Expand Down Expand Up @@ -2600,7 +2600,7 @@ package ExternData "Library for data I/O of CSV, INI, JSON, MATLAB MAT, SSV, TIR
__iti_dll = "ITI_ED_XML2File.dll",
__iti_dllNoExport = true,
Include = "#include \"ED_XML2File.h\"",
Library = {"ED_XML2File", "xml2", "zlib"});
Library = {"ED_XML2File", "xml2", "zlib", "bcrypt"});
end constructor;

function destructor "Clean up"
Expand All @@ -2610,7 +2610,7 @@ package ExternData "Library for data I/O of CSV, INI, JSON, MATLAB MAT, SSV, TIR
__iti_dll = "ITI_ED_XML2File.dll",
__iti_dllNoExport = true,
Include = "#include \"ED_XML2File.h\"",
Library = {"ED_XML2File", "xml2", "zlib"});
Library = {"ED_XML2File", "xml2", "zlib", "bcrypt"});
end destructor;
end ExternXML2File;
end Types;
Expand Down

0 comments on commit 97401f2

Please sign in to comment.