main
Laptop Windows 2024-02-21 20:24:15 -05:00
parent 27e18b5a9c
commit 679b550d94
9 changed files with 70 additions and 5 deletions

8
.idea/.gitignore vendored Normal file
View File

@ -0,0 +1,8 @@
# Default ignored files
/shelf/
/workspace.xml
# Editor-based HTTP Client requests
/httpRequests/
# Datasource local storage ignored files
/dataSources/
/dataSources.local.xml

1
.idea/.name Normal file
View File

@ -0,0 +1 @@
lilfbtf5

2
.idea/Femboy_GP.iml Normal file
View File

@ -0,0 +1,2 @@
<?xml version="1.0" encoding="UTF-8"?>
<module classpath="CMake" type="CPP_MODULE" version="4" />

14
.idea/deployment.xml Normal file
View File

@ -0,0 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="PublishConfigData" remoteFilesAllowedToDisappearOnAutoupload="false">
<serverData>
<paths name="Lafoge GCC (4972adc7-5214-4799-a7ab-d5d141cf07f2)">
<serverdata>
<mappings>
<mapping local="$PROJECT_DIR$" web="/" />
</mappings>
</serverdata>
</paths>
</serverData>
</component>
</project>

4
.idea/misc.xml Normal file
View File

@ -0,0 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="CMakeWorkspace" PROJECT_DIR="$PROJECT_DIR$" />
</project>

8
.idea/modules.xml Normal file
View File

@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/.idea/Femboy_GP.iml" filepath="$PROJECT_DIR$/.idea/Femboy_GP.iml" />
</modules>
</component>
</project>

8
.idea/vcs.xml Normal file
View File

@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="" vcs="Git" />
<mapping directory="$PROJECT_DIR$/libs/BLT" vcs="Git" />
<mapping directory="$PROJECT_DIR$/libs/BLT/libraries/parallel-hashmap" vcs="Git" />
</component>
</project>

View File

@ -5,7 +5,9 @@ option(ENABLE_ADDRSAN "Enable the address sanitizer" OFF)
option(ENABLE_UBSAN "Enable the ub sanitizer" OFF)
option(ENABLE_TSAN "Enable the thread data race sanitizer" OFF)
if(!MSVC)
add_compile_options(-march=native)
endif()
set(CMAKE_CXX_STANDARD 17)
@ -19,8 +21,17 @@ add_library(lilfbtf5 ${PROJECT_BUILD_FILES})
target_include_directories(lilfbtf5 PUBLIC include/)
target_link_libraries(lilfbtf5 PUBLIC BLT)
target_compile_options(lilfbtf5 PRIVATE -Wall -Wextra -Werror -Wpedantic -Wno-comment)
target_link_options(lilfbtf5 PRIVATE -Wall -Wextra -Werror -Wpedantic -Wno-comment)
message("Is MSVC ${MSVC}")
if(MSVC)
message("Using MSVC")
#target_compile_options(${BLT_TARGET} PRIVATE /W4)
else()
message("Using non MSVC options")
# perhaps we should warn on unused variables, but BLT will have lots of them.
target_compile_options(lilfbtf5 PRIVATE -Wall -Wextra -Wpedantic -Wno-comment)
target_link_options(lilfbtf5 PRIVATE -Wall -Wextra -Wpedantic -Wno-comment)
endif()
if (${ENABLE_ADDRSAN} MATCHES ON)
target_compile_options(lilfbtf5 PRIVATE -fsanitize=address)
@ -44,8 +55,17 @@ add_executable(lilfbtf5_test ${PROJECT_TESTS_BUILD_FILES})
target_include_directories(lilfbtf5_test PUBLIC tests/include/)
target_link_libraries(lilfbtf5_test PUBLIC lilfbtf5)
target_compile_options(lilfbtf5_test PRIVATE -Wall -Wextra -Werror -Wpedantic -Wno-comment)
target_link_options(lilfbtf5_test PRIVATE -Wall -Wextra -Werror -Wpedantic -Wno-comment)
if(MSVC)
message("Using MSVC")
#target_compile_options(${BLT_TARGET} PRIVATE /W4)
else()
message("Using non MSVC options")
# perhaps we should warn on unused variables, but BLT will have lots of them.
target_compile_options(lilfbtf5_test PRIVATE -Wall -Wextra -Wpedantic -Wno-comment)
target_link_options(lilfbtf5_test PRIVATE -Wall -Wextra -Wpedantic -Wno-comment)
endif()
if (${ENABLE_ADDRSAN} MATCHES ON)
target_compile_options(lilfbtf5_test PRIVATE -fsanitize=address)

@ -1 +1 @@
Subproject commit 392c32751da3f23644990581fda9fe59ec603de2
Subproject commit 43cf8c0ba1c151048679d0cfbeb6d82dab757a64