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

Export symbols at class level #220

Merged
merged 2 commits into from
Oct 21, 2024
Merged

Export symbols at class level #220

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
61e43f1
feat: enable MinGW build
arauschert Oct 10, 2024
ba25ecb
Update ExternalAntlr4Cpp.cmake
kmfrank Oct 16, 2024
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
6 changes: 6 additions & 0 deletions cpp/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,11 @@ if(MSVC)
write_file("${CMAKE_CURRENT_SOURCE_DIR}/buildArtifact/msbuildcmd.txt" "cmd,${CMAKE_VS_MSBUILD_COMMAND}")
endif(MSVC)

################################################################
# Allow for higher section count in object files in MinGW
if(MINGW)
add_compile_options(-Wa,-mbig-obj -O2)
endif()

################################################################
# Add a module path for cmake modules
Expand Down Expand Up @@ -65,6 +70,7 @@ endif()

set(ANTLR4_TAG 4.8)
set(ANTLR4_ZIP_REPOSITORY ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/antlr/antlr4-${ANTLR4_TAG}.zip)
set(ANTLR4_MINGW_PATCH ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/antlr/antlr4-${ANTLR4_TAG}-mingw.patch)
set(ANTLR_EXECUTABLE ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/antlr/antlr-${ANTLR4_TAG}-complete.jar)

# add external build for antlrcpp
Expand Down
146 changes: 145 additions & 1 deletion cpp/CMakePresets.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"description": "Base preset for x64 architecture on Windows",
"name": "x64Arch",
"architecture": "x64",
"toolset": "host=x64",
"toolset": "host=x64",
"environment": {
"PR_ENV_ARCH": "x64"
},
Expand Down Expand Up @@ -450,6 +450,20 @@
"value": "TRUE"
}
},
"warnings": { "dev": false },
"hidden": true
},
{
"name": "MSYS-Makefiles",
"description": "Base preset for MSYS Makefiles",
"generator": "MSYS Makefiles",
"binaryDir": "${sourceDir}/build/cg$env{PR_ENV_BUILD_TYPE}Make$env{PR_ENV_BINDING}",
"cacheVariables": {
"MASTER_PROJECT": {
"type": "STRING",
"value": "TRUE"
}
},
"warnings": {"dev": false},
"hidden": true
},
Expand Down Expand Up @@ -502,6 +516,38 @@
],
"hidden": true
},
{
"name": "MSYS-shared",
"cacheVariables": {
"BUILD_SHARED_LIBS": {
"type": "BOOL",
"value": "ON"
}
},
"environment": {
"PR_ENV_BINDING": "Shared"
},
"inherits": [
"MSYS-Makefiles"
],
"hidden": true
},
{
"name": "MSYS-static",
"cacheVariables": {
"BUILD_SHARED_LIBS": {
"type": "BOOL",
"value": "OFF"
}
},
"environment": {
"PR_ENV_BINDING": "Static"
},
"inherits": [
"MSYS-Makefiles"
],
"hidden": true
},
{
"name": "Linux-static",
"cacheVariables": {
Expand Down Expand Up @@ -576,6 +622,65 @@
"Build-type-relWithDebInfo"
],
"hidden": true
},
{
"name": "MSYS-shared-debug",
"displayName": "MSYS shared debug",
"description": "Build using MSYS Makefiles",
"inherits": [
"MSYS-shared",
"Build-type-debug"
]
},
{
"name": "MSYS-static-debug",
"displayName": "MSYS static debug",
"description": "Build using MSYS Makefiles",
"inherits": [
"MSYS-static",
"Build-type-debug"
]
},
{
"name": "MSYS-shared-release",
"displayName": "MSYS shared release",
"description": "Build using MSYS Makefiles",
"inherits": [
"MSYS-shared",
"Build-type-release"
]
},
{
"name": "MSYS-static-release",
"displayName": "MSYS static release",
"description": "Build using MSYS Makefiles",
"inherits": [
"MSYS-static",
"Build-type-release"
]
},
{
"name": "MSYS-shared-relWithDebInfo",
"displayName": "MSYS shared relWithDebInfo",
"description": "Build using MSYS Makefiles",
"inherits": [
"MSYS-shared",
"Build-type-relWithDebInfo"
],
"hidden": true
},
{
"name": "MSYS-static-relWithDebInfo",
"displayName": "MSYS static relWithDebInfo",
"description": "Build using MSYS Makefiles",
"environment": {
"PR_ENV_BUILD_TYPE": "RelWithDebInfo"
},
"inherits": [
"MSYS-static",
"Build-type-relWithDebInfo"
],
"hidden": true
}
],
"buildPresets": [
Expand Down Expand Up @@ -617,6 +722,44 @@
"configurePreset": "Linux-static-relWithDebInfo",
"hidden": true
},
{
"name": "Build-MSYS-shared-release",
"description": "Build shared release using MSYS Makefiles",
"displayName": "Build MSYS shared release",
"configurePreset": "MSYS-shared-release"
},
{
"name": "Build-MSYS-shared-debug",
"description": "Build shared debug using MSYS Makefiles",
"displayName": "Build MSYS shared debug",
"configurePreset": "MSYS-shared-debug"
},
{
"name": "Build-MSYS-shared-relWithDebInfo",
"description": "Build shared relWithDebInfo using MSYS Makefiles",
"displayName": "Build MSYS shared relWithDebInfo",
"configurePreset": "MSYS-shared-relWithDebInfo",
"hidden": true
},
{
"name": "Build-MSYS-static-release",
"description": "Build static release using MSYS Makefiles",
"displayName": "Build MSYS static release",
"configurePreset": "MSYS-static-release"
},
{
"name": "Build-MSYS-static-debug",
"description": "Build static debug using MSYS Makefiles",
"displayName": "Build MSYS static debug",
"configurePreset": "MSYS-static-debug"
},
{
"name": "Build-MSYS-static-relWithDebInfo",
"description": "Build static relWithDebInfo using MSYS Makefiles",
"displayName": "Build MSYS static relWithDebInfo",
"configurePreset": "MSYS-static-relWithDebInfo",
"hidden": true
},
{
"name": "Build-VS2022-x64-shared",
"description": "Build shared 64 bit version using Visual Studio 2022",
Expand Down Expand Up @@ -797,3 +940,4 @@
}
]
}

10 changes: 5 additions & 5 deletions cpp/applications/expressionsTester/src/test/OpenScenarioExpressionsTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,14 @@
* limitations under the License.
*/

#ifdef WIN32
# include <direct.h>
# define GETCWD _getcwd
# define OS_PATH_MAX _MAX_PATH
#elif defined (__linux__) || defined (__APPLE__)
#if defined (__linux__) || defined (__APPLE__) || defined (__MINGW32__) || defined (__MINGW64__)
# include <unistd.h>
# define GETCWD getcwd
# define OS_PATH_MAX PATH_MAX
#elif defined (WIN32)
# include <direct.h>
# define GETCWD _getcwd
# define OS_PATH_MAX _MAX_PATH
#else
# error "Operating system not supported."
#endif
Expand Down
Loading
Loading