StarMirror/qTox
1
0
Fork 0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00
Code Issues Projects Releases Wiki Activity

chore(build): Remove '-pie' linker flag and fix strmiids dependency on Windows

Browse Source 
One part fixes #4280 (removing this flag giving qTox on Windows able to start properly), another part fixes my mistake in #4258 (strmiids still needed for
linking, but previous searching of this libstrmiids.a wasn't include, for example, '/mingw32/i686-w64-mingw32/lib'. So I just add this lib to $ALL_LIBRARIES,
because it exists in system by default).
This commit is contained in:
DX37 2017-03-23 14:35:13 +06:00
parent 6b5d25acc7
commit f6b8601897
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -46,11 +46,11 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-rtti")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIE")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wstrict-overflow")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wstrict-aliasing")
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -pie")
if (NOT WIN32)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fstack-protector-all")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wstack-protector")
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -pie")
endif()
if (UNIX AND NOT APPLE)

4
cmake/Dependencies.cmake
View File

@ -119,6 +119,10 @@ if(APPLE)
search_dependency(IOKIT FRAMEWORK IOKit OPTIONAL)
endif()
if(WIN32)
set(ALL_LIBRARIES ${ALL_LIBRARIES} strmiids)
endif()
if (NOT GIT_DESCRIBE)
execute_process(
COMMAND git describe --tags