Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update libxml2 to version 2.11.4. #1216

Merged
merged 7 commits into from
Jul 18, 2023
Merged

Update libxml2 to version 2.11.4. #1216

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
dec7b61
Update libxml2 to version 2.11.4.
mahge Jul 14, 2023
b138002
Disable iconv for MSVC builds.
mahge Jul 14, 2023
cd78c9f
Do not add 's' postfix for the static lib.
mahge Jul 14, 2023
9b9b4a8
Define LIBXML_STATIC since we are using the static libxml
mahge Jul 14, 2023
96a3f8b
Compile OMTLMSimulator libs with /MD if using MSVC.
mahge Jul 15, 2023
b2af282
Libxml2 is no longer needed to be installed after build.
mahge Jul 15, 2023
9d778b0
Update 3rdParty and OMTLMSimulator to merged versions.
mahge Jul 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion 3rdParty
Open in desktop
Submodule 3rdParty updated 412 files
12 changes: 7 additions & 5 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,14 +284,14 @@ config-libxml2:
@echo
else
config-libxml2: 3rdParty/libxml2/$(INSTALL_DIR)/lib/libxml2.a
3rdParty/libxml2/$(INSTALL_DIR)/lib/libxml2.a: 3rdParty/libxml2/Makefile
$(MAKE) -C 3rdParty/libxml2/ && $(MAKE) -C 3rdParty/libxml2/ install
3rdParty/libxml2/Makefile:
3rdParty/libxml2/$(INSTALL_DIR)/lib/libxml2.a: 3rdParty/libxml2/$(BUILD_DIR)/Makefile
$(MAKE) -C 3rdParty/libxml2/$(BUILD_DIR)/ install
3rdParty/libxml2/$(BUILD_DIR)/Makefile: 3rdParty/libxml2/CMakeLists.txt
@echo
@echo "# config libxml2"
@echo
$(MKDIR) 3rdParty/libxml2/$(INSTALL_DIR)
cd 3rdParty/libxml2 && $(FPIC) ./autogen.sh --prefix="$(ROOT_DIR)/3rdParty/libxml2/$(INSTALL_DIR)" $(DISABLE_SHARED) --without-python --without-zlib --without-lzma $(HOST_CROSS_TRIPLE)
$(MKDIR) 3rdParty/libxml2/$(BUILD_DIR)
cd 3rdParty/libxml2/$(BUILD_DIR) && $(CMAKE) $(CMAKE_TARGET) ../.. -DCMAKE_INSTALL_PREFIX=../../$(INSTALL_DIR) -DBUILD_SHARED_LIBS=OFF -DLIBXML2_WITH_PYTHON=OFF -DLIBXML2_WITH_ZLIB=OFF -DLIBXML2_WITH_LZMA=OFF -DLIBXML2_WITH_TESTS=OFF
endif

distclean:
Expand All @@ -309,6 +309,8 @@ distclean:
$(RM) 3rdParty/kinsol/$(INSTALL_DIR)
$(RM) 3rdParty/xerces/$(BUILD_DIR)
$(RM) 3rdParty/xerces/$(INSTALL_DIR)
$(RM) 3rdParty/libxml2/$(BUILD_DIR)
$(RM) 3rdParty/libxml2/$(INSTALL_DIR)

testsuite:
@echo
Expand Down
2 changes: 1 addition & 1 deletion OMTLMSimulator
Open in desktop
Submodule OMTLMSimulator updated 3 files
+1 −1 3rdParty/misc/Makefile.msvc
+1 −1 3rdParty/rtime/Makefile.msvc
+1 −1 common/Makefile.msvc
15 changes: 9 additions & 6 deletions configWinVS.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,13 +220,16 @@ EXIT /B 0
:: -- config libxml2 ------------------
:libxml2
ECHO # config libxml2
CD 3rdParty\libxml2
START /B /WAIT CMD /C "buildWinVS.bat %OMS_VS_TARGET%"
IF EXIST "3rdParty\libxml2\build\win\" RMDIR /S /Q 3rdParty\libxml2\build\win
IF EXIST "3rdParty\libxml2\install\win\" RMDIR /S /Q 3rdParty\libxml2\install\win
MKDIR 3rdParty\libxml2\build\win
CD 3rdParty\libxml2\build\win
cmake.exe -G %OMS_VS_VERSION% ..\.. -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DCMAKE_INSTALL_PREFIX=..\..\install\win -DBUILD_SHARED_LIBS=OFF -DLIBXML2_WITH_PYTHON=OFF -DLIBXML2_WITH_ZLIB=OFF -DLIBXML2_WITH_LZMA=OFF -DLIBXML2_WITH_TESTS=OFF -DLIBXML2_WITH_ICONV=OFF
IF NOT ["%ERRORLEVEL%"]==["0"] GOTO fail
CD ..\..\..\..
ECHO # build libxml2
msbuild.exe "3rdParty\libxml2\build\win\INSTALL.vcxproj" /t:Build /p:configuration=Release /maxcpucount
IF NOT ["%ERRORLEVEL%"]==["0"] GOTO fail
CD ..\..
ECHO # copy libxml2
IF NOT EXIST "install\win\bin" MKDIR install\win\bin
XCOPY /Y /F 3rdParty\libxml2\install\win\bin\libxml2.dll install\win\bin
EXIT /B 0
:: -- config libxml2 ------------------

Expand Down
1 change: 0 additions & 1 deletion src/OMSimulatorPython/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ IF (WIN32 AND MSVC)
install(DIRECTORY ${CMAKE_INSTALL_PREFIX}/bin/ DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/OMSimulator FILES_MATCHING PATTERN "*imulator*.dll" PATTERN "OMSimulator" EXCLUDE PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ)
install(DIRECTORY ${CMAKE_INSTALL_PREFIX}/bin/ DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/OMSimulator FILES_MATCHING PATTERN "*boost*mt-1*.dll" PATTERN "OMSimulator" EXCLUDE PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ)
install(FILES ${CMAKE_INSTALL_PREFIX}/bin/pthreadVC2.dll DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/OMSimulator PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ)
install(FILES ${CMAKE_INSTALL_PREFIX}/bin/libxml2.dll DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/OMSimulator PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ)
ELSEIF (WIN32 AND MINGW)
install(FILES OMSimulatorPython3.bat DESTINATION ${CMAKE_INSTALL_PREFIX}/bin PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ)
install(FILES OMSimulatorPython3 DESTINATION ${CMAKE_INSTALL_PREFIX}/bin PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ)
Expand Down