kotatogram/cmake_helpers
1
0
Fork 0
Code Issues Activity

Synchronize dispatch and jemalloc build flags with common_options

Browse source
This commit is contained in:
Ilya Fedin 2022-10-05 14:24:45 +04:00 • committed by John Preston
parent 4294a1872f
commit 36ee4977bb
2 changed files with 22 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
external/dispatch/CMakeLists.txt vendored
View file

@ -14,15 +14,34 @@ if (DESKTOP_APP_USE_PACKAGED)
endif() endif()
if (NOT DESKTOP_APP_DISPATCH_LIBRARIES OR NOT DESKTOP_APP_DISPATCH_INCLUDE_DIRS) if (NOT DESKTOP_APP_DISPATCH_LIBRARIES OR NOT DESKTOP_APP_DISPATCH_INCLUDE_DIRS)
if (DESKTOP_APP_SPECIAL_TARGET)
set(dispatch_extra_args
-DCMAKE_BUILD_TYPE=None
"-DCMAKE_C_FLAGS=-g -Ofast -pipe -fPIC -fstack-protector-all -DNDEBUG -D_FORTIFY_SOURCE=2 -D_GLIBCXX_ASSERTIONS"
"-DCMAKE_CXX_FLAGS=-g -Ofast -pipe -fPIC -fstack-protector-all -DNDEBUG -D_FORTIFY_SOURCE=2 -D_GLIBCXX_ASSERTIONS"
)
elseif (NOT DESKTOP_APP_USE_PACKAGED)
set(dispatch_extra_args
-DCMAKE_BUILD_TYPE=Release
"-DCMAKE_C_FLAGS=-pipe -fPIC -fstack-protector-all -D_GLIBCXX_ASSERTIONS"
"-DCMAKE_CXX_FLAGS=-pipe -fPIC -fstack-protector-all -D_GLIBCXX_ASSERTIONS"
)
elseif (DEFINED CMAKE_BUILD_TYPE)
set(dispatch_extra_args
-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
)
else()
set(dispatch_extra_args)
endif()
execute_process( execute_process(
COMMAND ${CMAKE_COMMAND} ${dispatch_loc} COMMAND ${CMAKE_COMMAND} ${dispatch_loc}
-B ${dispatch_binary_dir} -B ${dispatch_binary_dir}
-GNinja -GNinja
-DCMAKE_BUILD_TYPE=Release
-DCMAKE_C_COMPILER=clang -DCMAKE_C_COMPILER=clang
-DCMAKE_CXX_COMPILER=clang++ -DCMAKE_CXX_COMPILER=clang++
-DBUILD_SHARED_LIBS=OFF -DBUILD_SHARED_LIBS=OFF
-DBUILD_TESTING=OFF -DBUILD_TESTING=OFF
${dispatch_extra_args}
) )
execute_process( execute_process(

4
external/jemalloc/CMakeLists.txt vendored
View file

@ -36,8 +36,8 @@ ExternalProject_Add(jemalloc
CONFIGURE_COMMAND env CONFIGURE_COMMAND env
CC=clang CC=clang
CXX=clang++ CXX=clang++
"EXTRA_CFLAGS=-fstack-protector-all -D_FORTIFY_SOURCE=2" "$<IF:$<OR:$<NOT:$<BOOL:${DESKTOP_APP_USE_PACKAGED}>>,$<BOOL:${DESKTOP_APP_SPECIAL_TARGET}>>,EXTRA_CFLAGS=$<$<BOOL:${DESKTOP_APP_SPECIAL_TARGET}>:-Ofast> -fstack-protector-all -DNDEBUG -D_FORTIFY_SOURCE=2 -D_GLIBCXX_ASSERTIONS,=>"
"EXTRA_CXXFLAGS=-fstack-protector-all -D_FORTIFY_SOURCE=2" "$<IF:$<OR:$<NOT:$<BOOL:${DESKTOP_APP_USE_PACKAGED}>>,$<BOOL:${DESKTOP_APP_SPECIAL_TARGET}>>,EXTRA_CXXFLAGS=$<$<BOOL:${DESKTOP_APP_SPECIAL_TARGET}>:-Ofast> -fstack-protector-all -DNDEBUG -D_FORTIFY_SOURCE=2 -D_GLIBCXX_ASSERTIONS,=>"
./autogen.sh --disable-shared ./autogen.sh --disable-shared
BUILD_IN_SOURCE 1 BUILD_IN_SOURCE 1
STEP_TARGETS build STEP_TARGETS build