From 5a6f3140830cc1a80a5eab81c285a5a1447f0491 Mon Sep 17 00:00:00 2001 From: Mahder Gebremedhin Date: Fri, 4 Nov 2022 18:27:54 +0100 Subject: [PATCH] Fix 3rdParty/FMIL installation behavior. - Respect the users choice in installation prefix. Do not overwrite. Fixed other related issues. - This is constantly creating problems in other places. --- 3rdParty | 2 +- Makefile | 2 +- configWinVS.bat | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/3rdParty b/3rdParty index 5dbb9675c..6202ca12a 160000 --- a/3rdParty +++ b/3rdParty @@ -1 +1 @@ -Subproject commit 5dbb9675ce8351d075ad41daf6aba10fef6369ef +Subproject commit 6202ca12a58c6ae29e6bcaa678484cae374ae470 diff --git a/Makefile b/Makefile index e5095f6b7..23db48c7a 100644 --- a/Makefile +++ b/Makefile @@ -212,7 +212,7 @@ config-fmil: 3rdParty/FMIL/$(INSTALL_DIR)/lib/libfmilib.a @echo $(MKDIR) 3rdParty/FMIL/$(BUILD_DIR) $(MKDIR) 3rdParty/FMIL/$(INSTALL_DIR) - cd 3rdParty/FMIL/$(BUILD_DIR) && $(CMAKE) $(CMAKE_TARGET) ../.. -DFMILIB_INSTALL_PREFIX=../../$(INSTALL_DIR) -DFMILIB_BUILD_TESTS:BOOL=0 -DFMILIB_GENERATE_DOXYGEN_DOC:BOOL=0 -DFMILIB_BUILD_STATIC_LIB:BOOL=1 -DFMILIB_BUILD_SHARED_LIB:BOOL=0 -DBUILD_TESTING:BOOL=0 -DFMILIB_BUILD_BEFORE_TESTS:BOOL=0 $(FMIL_FLAGS) + cd 3rdParty/FMIL/$(BUILD_DIR) && $(CMAKE) $(CMAKE_TARGET) ../.. -DCMAKE_INSTALL_PREFIX=../../$(INSTALL_DIR) -DFMILIB_BUILD_TESTS:BOOL=0 -DFMILIB_GENERATE_DOXYGEN_DOC:BOOL=0 -DFMILIB_BUILD_STATIC_LIB:BOOL=1 -DFMILIB_BUILD_SHARED_LIB:BOOL=0 -DBUILD_TESTING:BOOL=0 -DFMILIB_BUILD_BEFORE_TESTS:BOOL=0 $(FMIL_FLAGS) -Wno-dev config-lua: 3rdParty/Lua/$(INSTALL_DIR)/liblua.a 3rdParty/Lua/$(INSTALL_DIR)/liblua.a: diff --git a/configWinVS.bat b/configWinVS.bat index 08c451f47..3fda719b8 100644 --- a/configWinVS.bat +++ b/configWinVS.bat @@ -94,7 +94,7 @@ IF EXIST "3rdParty\FMIL\build\win\" RMDIR /S /Q 3rdParty\FMIL\build\win IF EXIST "3rdParty\FMIL\install\win\" RMDIR /S /Q 3rdParty\FMIL\install\win MKDIR 3rdParty\FMIL\build\win CD 3rdParty\FMIL\build\win -cmake.exe -G %OMS_VS_VERSION% ..\.. -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DFMILIB_INSTALL_PREFIX=..\..\install\win -DFMILIB_BUILD_TESTS:BOOL=0 -DFMILIB_GENERATE_DOXYGEN_DOC:BOOL=0 -DFMILIB_BUILD_STATIC_LIB:BOOL=1 -DFMILIB_BUILD_SHARED_LIB:BOOL=0 -DBUILD_TESTING:BOOL=0 -DFMILIB_BUILD_BEFORE_TESTS:BOOL=0 +cmake.exe -G %OMS_VS_VERSION% ..\.. -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DCMAKE_INSTALL_PREFIX=..\..\install\win -DFMILIB_BUILD_TESTS:BOOL=0 -DFMILIB_GENERATE_DOXYGEN_DOC:BOOL=0 -DFMILIB_BUILD_STATIC_LIB:BOOL=1 -DFMILIB_BUILD_SHARED_LIB:BOOL=0 -DBUILD_TESTING:BOOL=0 -DFMILIB_BUILD_BEFORE_TESTS:BOOL=0 -Wno-dev IF NOT ["%ERRORLEVEL%"]==["0"] GOTO fail CD ..\..\..\.. ECHO # build fmil