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

Refactor detection and use of regex libraries. #1227

Merged
merged 2 commits into from
Aug 3, 2023
Merged

Refactor detection and use of regex libraries. #1227

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
74d59ab
Refactor detection and use of regex libraries.
mahge Aug 3, 2023
9d02cab
Update to merged 3rdParty
mahge Aug 3, 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 3 files
+1 −2 RegEx/CMakeLists.txt
+0 −40 RegEx/OMSRegEx.cpp
+12 −5 RegEx/RegEx.h
7 changes: 0 additions & 7 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,13 +50,6 @@ ENDIF()

message(STATUS "Platform string: ${PLATFORM_STRING}")

if("${STD_REGEX}" STREQUAL "0")
message(WARNING, "Using boost::regex instead of std::regex due to old gcc/clang compiler")
set(LIB_BOOST_REGEX regex)
else()
message(STATUS "Using std::regex, the gcc/clang compiler is good enough")
ENDIF()

##########################

add_subdirectory(3rdParty)
Expand Down
17 changes: 5 additions & 12 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ else
CMAKE_BOOST_ROOT="-DBOOST_ROOT=$(BOOST_ROOT)"
endif

.PHONY: OMSimulator OMSimulatorCore config-OMSimulator config-xerces config-3rdParty distclean testsuite doc doc-html doc-doxygen OMTLMSimulator OMTLMSimulatorClean RegEx pip
.PHONY: OMSimulator OMSimulatorCore config-OMSimulator config-xerces config-3rdParty distclean testsuite doc doc-html doc-doxygen OMTLMSimulator OMTLMSimulatorClean pip

OMSimulator:
@echo OS: $(detected_OS)
Expand Down Expand Up @@ -138,7 +138,7 @@ pip:
@echo "> twine upload src/pip/install/dist/$(shell ls src/pip/install/dist/ -Art | tail -n 1)"

ifeq ($(OMTLM),ON)
OMTLMSimulator: RegEx
OMTLMSimulator:
@echo
@echo "# make OMTLMSimulator"
@echo
Expand All @@ -152,7 +152,7 @@ OMTLMSimulator: RegEx
test ! `uname` != Darwin || cp OMTLMSimulator/bin/FMIWrapper $(TOP_INSTALL_DIR)/bin/
test ! `uname` != Darwin || cp OMTLMSimulator/bin/StartTLMFmiWrapper $(TOP_INSTALL_DIR)/bin/

OMTLMSimulatorStandalone: RegEx
OMTLMSimulatorStandalone:
@echo
@echo "# make OMTLMSimulator Standalone"
@echo
Expand All @@ -168,25 +168,19 @@ OMTLMSimulatorClean:
@echo
@$(MAKE) -C OMTLMSimulator clean

# build our RegEx executable that will tell us if we need to use std::regex or boost::regex
RegEx: 3rdParty/RegEx/OMSRegEx$(EEXT)
3rdParty/RegEx/OMSRegEx$(EEXT): 3rdParty/RegEx/RegEx.h 3rdParty/RegEx/OMSRegEx.cpp
$(MAKE) -C 3rdParty/RegEx

3rdParty/README.md:
@echo "Please checkout the 3rdParty submodule, e.g. using \"git submodule update --init 3rdParty\", and try again."
@false

config-3rdParty: 3rdParty/README.md

config-OMSimulator: $(BUILD_DIR)/Makefile
$(BUILD_DIR)/Makefile: RegEx CMakeLists.txt
$(BUILD_DIR)/Makefile: CMakeLists.txt
@echo
@echo "# config OMSimulator"
@echo
$(eval STD_REGEX := $(shell 3rdParty/RegEx/OMSRegEx$(EEXT)))
$(MKDIR) $(BUILD_DIR)
$(CMAKE) -S . -B $(BUILD_DIR) $(CMAKE_TARGET) -DSTD_REGEX=$(STD_REGEX) -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DASAN:BOOL=$(ASAN) -DCMAKE_BUILD_TYPE=$(BUILD_TYPE) $(CMAKE_BOOST_ROOT) $(CMAKE_INSTALL_PREFIX) $(HOST_SHORT) $(EXTRA_CMAKE) $(CMAKE_STATIC)
$(CMAKE) -S . -B $(BUILD_DIR) $(CMAKE_TARGET) -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DASAN:BOOL=$(ASAN) -DCMAKE_BUILD_TYPE=$(BUILD_TYPE) $(CMAKE_BOOST_ROOT) $(CMAKE_INSTALL_PREFIX) $(HOST_SHORT) $(EXTRA_CMAKE) $(CMAKE_STATIC)

config-xerces: 3rdParty/xerces/$(INSTALL_DIR)/lib/libxerces-c.a
3rdParty/xerces/$(INSTALL_DIR)/lib/libxerces-c.a: 3rdParty/xerces/$(BUILD_DIR)/Makefile
Expand All @@ -205,7 +199,6 @@ distclean:
@$(MAKE) OMTLMSimulatorClean
$(RM) $(BUILD_DIR)
$(RM) $(INSTALL_DIR)
$(RM) 3rdParty/RegEx/OMSRegEx$(EEXT)
$(RM) 3rdParty/xerces/$(BUILD_DIR)
$(RM) 3rdParty/xerces/$(INSTALL_DIR)

Expand Down