Browse Source

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

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).
reviewable/pr4281/r2
DX37 8 years ago
parent
commit
f6b8601897
  1. 2
      CMakeLists.txt
  2. 4
      cmake/Dependencies.cmake

2
CMakeLists.txt

@ -46,11 +46,11 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-rtti") @@ -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

@ -119,6 +119,10 @@ if(APPLE) @@ -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

Loading…
Cancel
Save