build(cmake) Remove sanirizers from the main CMakeLists.txt · BigRedEye/cpparg@4053d4b · GitHub

BigRedEye / cpparg Public

• Notifications You must be signed in to change notification settings
• Fork 1
• Star 2

• Code
• Issues
• Pull requests
• Actions
• Projects
• Security and quality
• Insights

Additional navigation options

Commit 4053d4b

Browse filesBrowse the repository at this point in the historyBrowse files

BigRedEye

committed

build(cmake) Remove sanirizers from the main CMakeLists.txt

1 parent e9837ec commit 4053d4b
Copy full SHA for 4053d4b

6 files changed

+32-27Lines changed: 32 additions & 27 deletions

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• CMakeLists.txt
• cmake
  • CMakeLists.txt.in
  • DownloadGoogleTest.cmake
  • Sanitizers.cmake
• examples
  • CMakeLists.txt
• test
  • CMakeLists.txt

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎CMakeLists.txt‎

Copy file name to clipboardExpand all lines: CMakeLists.txt

+1-25Lines changed: 1 addition & 25 deletions

Original file line number	Diff line number	Diff line change
@@ -5,31 +5,7 @@ project(cpparg)
5	5	set(CMAKE_CXX_STANDARD 17)
6	6	set(CMAKE_CXX_STANDARD_REQUIRED ON)
7	7
8		- if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
9		- SET( CMAKE_CXX_FLAGS_SANITIZERS "${CMAKE_CXX_FLAGS_DEBUG} -fsanitize=undefined,address -fsanitize-undefined-trap-on-error"
10		- CACHE STRING "Flags for C++ with UBSan and ASan enabled."
11		- FORCE)
12		- SET( CMAKE_C_FLAGS_SANITIZERS "${CMAKE_C_FLAGS_DEBUG} -fsanitize=undefined,address -fsanitize-undefined-trap-on-error"
13		- CACHE STRING "Flags for C with UBSan and ASan enabled."
14		- FORCE)
15		- SET( CMAKE_EXE_LINKER_FLAGS_SANITIZERS
16		- "${CMAKE_EXE_LINKER_FLAGS_DEBUG}" CACHE STRING
17		- "Flags for linker with UBSan and ASan enabled."
18		- FORCE )
19		- SET( CMAKE_SHARED_LINKER_FLAGS_SANITIZERS
20		- "${CMAKE_SHARED_LINKER_FLAGS_DEBUG}" CACHE STRING
21		- "Flags for linker with UBSan and ASan enabled."
22		- FORCE )
23		- MARK_AS_ADVANCED(
24		- CMAKE_CXX_FLAGS_SANITIZERS
25		- CMAKE_C_FLAGS_SANITIZERS
26		- CMAKE_EXE_LINKER_FLAGS_SANITIZERS
27		- CMAKE_SHARED_LINKER_FLAGS_SANITIZERS )
28		- # Update the documentation string of CMAKE_BUILD_TYPE for GUIs
29		- SET( CMAKE_BUILD_TYPE "${CMAKE_BUILD_TYPE}" CACHE STRING
30		- "Choose the type of build, options are: None Debug Release RelWithDebInfo MinSizeRel Sanitizers."
31		- FORCE )
32		- endif()
	8	+ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
33	9
34	10	file(GLOB HEADERS
35	11	include/cpparg/cpparg.h

Collapse file

‎test/cmake/CMakeLists.txt.in‎ ‎cmake/CMakeLists.txt.in‎test/cmake/CMakeLists.txt.in renamed to cmake/CMakeLists.txt.in

Copy file name to clipboard

File renamed without changes.

Collapse file

‎test/cmake/DownloadGoogleTest.cmake‎ ‎cmake/DownloadGoogleTest.cmake‎test/cmake/DownloadGoogleTest.cmake renamed to cmake/DownloadGoogleTest.cmake

Copy file name to clipboardExpand all lines: cmake/DownloadGoogleTest.cmake

+1-1Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
@@ -2,7 +2,7 @@
2	2
3	3	cmake_minimum_required(VERSION 2.8.2)
4	4	# Download and unpack googletest at configure time
5		- configure_file(cmake/CMakeLists.txt.in googletest-download/CMakeLists.txt)
	5	+ configure_file(${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt.in googletest-download/CMakeLists.txt)
6	6	execute_process(COMMAND ${CMAKE_COMMAND} -G "${CMAKE_GENERATOR}" .
7	7	RESULT_VARIABLE result
8	8	WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/googletest-download )

Collapse file

‎cmake/Sanitizers.cmake‎

Copy file name to clipboard

+26Lines changed: 26 additions & 0 deletions

Original file line number	Diff line number	Diff line change
@@ -0,0 +1,26 @@
	1	+ if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
	2	+ SET( CMAKE_CXX_FLAGS_SANITIZERS "${CMAKE_CXX_FLAGS_DEBUG} -fsanitize=undefined,address -fsanitize-undefined-trap-on-error"
	3	+ CACHE STRING "Flags for C++ with UBSan and ASan enabled."
	4	+ FORCE)
	5	+ SET( CMAKE_C_FLAGS_SANITIZERS "${CMAKE_C_FLAGS_DEBUG} -fsanitize=undefined,address -fsanitize-undefined-trap-on-error"
	6	+ CACHE STRING "Flags for C with UBSan and ASan enabled."
	7	+ FORCE)
	8	+ SET( CMAKE_EXE_LINKER_FLAGS_SANITIZERS
	9	+ "${CMAKE_EXE_LINKER_FLAGS_DEBUG}" CACHE STRING
	10	+ "Flags for linker with UBSan and ASan enabled."
	11	+ FORCE )
	12	+ SET( CMAKE_SHARED_LINKER_FLAGS_SANITIZERS
	13	+ "${CMAKE_SHARED_LINKER_FLAGS_DEBUG}" CACHE STRING
	14	+ "Flags for linker with UBSan and ASan enabled."
	15	+ FORCE )
	16	+ MARK_AS_ADVANCED(
	17	+ CMAKE_CXX_FLAGS_SANITIZERS
	18	+ CMAKE_C_FLAGS_SANITIZERS
	19	+ CMAKE_EXE_LINKER_FLAGS_SANITIZERS
	20	+ CMAKE_SHARED_LINKER_FLAGS_SANITIZERS )
	21	+ # Update the documentation string of CMAKE_BUILD_TYPE for GUIs
	22	+ SET( CMAKE_BUILD_TYPE "${CMAKE_BUILD_TYPE}" CACHE STRING
	23	+ "Choose the type of build, options are: None Debug Release RelWithDebInfo MinSizeRel Sanitizers."
	24	+ FORCE )
	25	+ endif()
	26	+

Collapse file

‎examples/CMakeLists.txt‎

Copy file name to clipboard

+2Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
@@ -1,4 +1,6 @@
1	1	cmake_minimum_required(VERSION 3.5)
2	2
	3	+ include(Sanitizers)
	4	+
3	5	add_subdirectory(parser)
4	6	add_subdirectory(mode_chooser)

Collapse file

‎test/CMakeLists.txt‎

Copy file name to clipboardExpand all lines: test/CMakeLists.txt

+2-1Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
@@ -5,7 +5,8 @@ project(cpparg-test)
5	5	set(CMAKE_CXX_STANDARD 17)
6	6	set(CMAKE_CXX_STANDARD_REQUIRED ON)
7	7
8		- include(cmake/DownloadGoogleTest.cmake)
	8	+ include(DownloadGoogleTest)
	9	+ include(Sanitizers)
9	10
10	11	file(GLOB SOURCES
11	12	main.cpp

0 commit comments

Comments

0 (0)