Skip to content

Commit 2fbeb7c

Browse files
Moving things in Include to Src, removing Include
Fixing MSVC object size limit and yaml import macro
1 parent fe6e47c commit 2fbeb7c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+6
-6
lines changed

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,5 +59,5 @@ compile_commands.json
5959

6060
# Generated file
6161
Src/runcpp2/DefaultYAMLs.c
62-
Include/cfgpath.h
62+
Src/cfgpath.h
6363
.aider*

CMakeLists.txt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ target_include_directories( string-view-lite INTERFACE
125125

126126
# Copy cfgpath.h
127127
configure_file( "${CMAKE_CURRENT_LIST_DIR}/External/cfgpath/cfgpath.h"
128-
"${CMAKE_CURRENT_LIST_DIR}/Include/cfgpath.h" COPYONLY)
128+
"${CMAKE_CURRENT_LIST_DIR}/Src/cfgpath.h" COPYONLY)
129129

130130
add_subdirectory("${CMAKE_CURRENT_LIST_DIR}/External/CppOverride")
131131

@@ -186,15 +186,14 @@ add_library(runcpp2Lib INTERFACE)
186186

187187
set(RUNCPP2_PRIVATE_LINK_LIBS ssLogger System2 CppOverride dylib)
188188
set(RUNCPP2_PUBLIC_LINK_LIBS ghc_filesystem mpark_variant MacroPowerToys string-view-lite libyaml DSResult)
189-
target_include_directories(runcpp2Lib INTERFACE "${CMAKE_CURRENT_LIST_DIR}/Include"
190-
"${CMAKE_CURRENT_LIST_DIR}/Src")
189+
target_include_directories(runcpp2Lib INTERFACE "${CMAKE_CURRENT_LIST_DIR}/Src")
191190
target_link_libraries(runcpp2Lib INTERFACE ${RUNCPP2_PRIVATE_LINK_LIBS})
192191
target_link_libraries(runcpp2Lib INTERFACE ${RUNCPP2_PUBLIC_LINK_LIBS})
193192

194193

195194
if (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
196195
# TODO: Try to change to /Wall
197-
set(RUNCPP2_STANDARD_COMPILE_FLAGS "/utf-8;/W1;/DGHC_WIN_DISABLE_WSTRING_STORAGE_TYPE=1")
196+
set(RUNCPP2_STANDARD_COMPILE_FLAGS "/utf-8;/W1;/DGHC_WIN_DISABLE_WSTRING_STORAGE_TYPE=1;/bigobj")
198197
if (RUNCPP2_WARNINGS_AS_ERRORS)
199198
list(APPEND RUNCPP2_STANDARD_COMPILE_FLAGS "/WX")
200199
endif()
@@ -220,7 +219,8 @@ target_compile_options(runcpp2Lib INTERFACE "${RUNCPP2_STANDARD_COMPILE_FLAGS}")
220219

221220
# Define the runcpp2 and default config version macro
222221
target_compile_definitions(runcpp2Lib INTERFACE RUNCPP2_VERSION="${RUNCPP2_PROJECT_VERSION}"
223-
RUNCPP2_CONFIG_VERSION=${RUNCPP2_CONFIG_VERSION})
222+
RUNCPP2_CONFIG_VERSION=${RUNCPP2_CONFIG_VERSION}
223+
YAML_DECLARE_STATIC=1)
224224

225225
# =========================================================================
226226
# runcpp2 executable
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)