Skip to content

Commit c3064a5

Browse files
committed
Fix & optimize CMAKE_CXX_FLAGS setting -I & -L flags whether FetchContent is used.
1 parent 5db9361 commit c3064a5

File tree

7 files changed

+15
-22
lines changed

7 files changed

+15
-22
lines changed

CMakeLists.txt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,11 @@ project(ParserSuite)
2727

2828
IF(CMAKE_CXX_COMPILER_ID MATCHES Clang|GNU)
2929
string(APPEND CMAKE_CXX_FLAGS " -Wall -Wextra -Wshadow -Wconversion -Ofast -std=c++20")
30+
IF(DEFINED FETCH_DEPENDEES)
31+
string(APPEND CMAKE_CXX_FLAGS " -I${FetchedBux_SOURCE_DIR}/include -I${FetchedCBrackets_SOURCE_DIR}")
32+
string(APPEND CMAKE_CXX_FLAGS " -L${FetchedBux_SOURCE_DIR}/src -L${FetchedCBrackets_SOURCE_DIR}")
33+
ENDIF()
34+
3035
IF(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
3136
message("Clang")
3237
string(APPEND CMAKE_CXX_FLAGS " -Wno-potentially-evaluated-expression -Wno-deprecated-anon-enum-enum-conversion")

ParserGen/CMakeLists.txt

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
#set(CMAKE_CXX_COMPILER_ID "Clang")
22

3+
IF(NOT DEFINED FETCH_DEPENDEES)
4+
string(APPEND CMAKE_CXX_FLAGS " -I../${DEPENDEE_ROOT}/bux/include -L../${DEPENDEE_ROOT}/bux/src")
5+
string(APPEND CMAKE_CXX_FLAGS " -I../${DEPENDEE_ROOT}/CBrackets -L../${DEPENDEE_ROOT}/CBrackets")
6+
ENDIF()
7+
38
string(APPEND CMAKE_CXX_FLAGS " -Wno-shadow")
49
#string(APPEND CMAKE_CXX_FLAGS " -g3 -Og")
5-
IF(DEFINED FETCH_DEPENDEES)
6-
string(APPEND CMAKE_CXX_FLAGS " -I../${DEPENDEE_ROOT}/bux -I../${DEPENDEE_ROOT}/CBrackets")
7-
ENDIF()
810

911
set(COMMON_SRC
1012
BNFContext.cpp
@@ -20,16 +22,12 @@ add_executable(parsergen
2022
${COMMON_SRC}
2123
)
2224
#target_compile_options(parsergen PRIVATE -O0 -g3)
23-
target_include_directories(parsergen PRIVATE "../${DEPENDEE_ROOT}/bux/include" "../${DEPENDEE_ROOT}/CBrackets")
24-
target_link_directories(parsergen PRIVATE "../${DEPENDEE_ROOT}/bux/src" "../${DEPENDEE_ROOT}/CBrackets")
2525
target_link_libraries(parsergen bracketPairing bux fmt stdc++)
2626
#add_dependencies(parsergen bracketPairing bux)
2727

2828
add_executable(grammarstrip
2929
GrammarStrip.cpp
3030
${COMMON_SRC}
3131
)
32-
target_include_directories(grammarstrip PRIVATE "../${DEPENDEE_ROOT}/bux/include" "../${DEPENDEE_ROOT}/CBrackets")
33-
target_link_directories(grammarstrip PRIVATE "../${DEPENDEE_ROOT}/bux/src" "../${DEPENDEE_ROOT}/CBrackets")
3432
target_link_libraries(grammarstrip bracketPairing bux fmt stdc++)
3533
#add_dependencies(grammarstrip bracketPairing bux)

ScannerGen/CMakeLists.txt

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#set(CMAKE_CXX_COMPILER_ID "Clang")
2-
IF(DEFINED FETCH_DEPENDEES)
3-
string(APPEND CMAKE_CXX_FLAGS " -I../${DEPENDEE_ROOT}/bux -I../${DEPENDEE_ROOT}/CBrackets")
1+
IF(NOT DEFINED FETCH_DEPENDEES)
2+
string(APPEND CMAKE_CXX_FLAGS " -I../${DEPENDEE_ROOT}/bux/include -L../${DEPENDEE_ROOT}/bux/src")
3+
string(APPEND CMAKE_CXX_FLAGS " -I../${DEPENDEE_ROOT}/CBrackets -L../${DEPENDEE_ROOT}/CBrackets")
44
ENDIF()
55

66
add_executable(scannergen
@@ -11,14 +11,10 @@ add_executable(scannergen
1111
spec2charset.cpp
1212
)
1313
#target_compile_options(scannergen PRIVATE -O0 -g3)
14-
target_include_directories(scannergen PRIVATE ../${DEPENDEE_ROOT}/bux/include ../${DEPENDEE_ROOT}/CBrackets)
15-
target_link_directories(scannergen PRIVATE ../${DEPENDEE_ROOT}/bux/src ../${DEPENDEE_ROOT}/CBrackets)
1614
target_link_libraries(scannergen bracketPairing bux fmt stdc++)
1715

1816
add_executable(handycharset
1917
HandyCharset.cpp
2018
spec2charset.cpp
2119
)
22-
target_include_directories(handycharset PRIVATE ../${DEPENDEE_ROOT}/bux/include)
23-
target_link_directories(handycharset PRIVATE ../${DEPENDEE_ROOT}/bux/src)
2420
target_link_libraries(handycharset bux fmt stdc++)

example/BisonGLR/CMakeLists.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,4 @@ add_executable(bisonglr
33
Parser.cpp
44
Scanner.cpp
55
)
6-
target_include_directories(bisonglr PRIVATE "../../${DEPENDEE_ROOT}/bux/include")
7-
target_link_directories(bisonglr PRIVATE "../../${DEPENDEE_ROOT}/bux/src")
86
target_link_libraries(bisonglr bux fmt stdc++)

example/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
IF(DEFINED FETCH_DEPENDEES)
2-
string(APPEND CMAKE_CXX_FLAGS " -I../../${DEPENDEE_ROOT}/bux -I../../${DEPENDEE_ROOT}/CBrackets")
1+
IF(NOT DEFINED FETCH_DEPENDEES)
2+
string(APPEND CMAKE_CXX_FLAGS " -I../../${DEPENDEE_ROOT}/bux/include -L../../${DEPENDEE_ROOT}/bux/src")
33
ENDIF()
44

55
add_subdirectory (MinLang)

example/CalcInt/CMakeLists.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,4 @@ add_executable(calci
33
Parser.cpp
44
Scanner.cpp
55
)
6-
target_include_directories(calci PRIVATE "../../${DEPENDEE_ROOT}/bux/include")
7-
target_link_directories(calci PRIVATE "../../${DEPENDEE_ROOT}/bux/src")
86
target_link_libraries(calci bux fmt stdc++)

example/MinLang/CMakeLists.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,4 @@ add_executable(minlang
44
Scanner.cpp
55
)
66
#target_compile_options(minlang PRIVATE -O0 -g3)
7-
target_include_directories(minlang PRIVATE "../../${DEPENDEE_ROOT}/bux/include")
8-
target_link_directories(minlang PRIVATE "../../${DEPENDEE_ROOT}/bux/src")
97
target_link_libraries(minlang bux fmt stdc++)

0 commit comments

Comments
 (0)