Skip to content
This repository has been archived by the owner on Dec 9, 2021. It is now read-only.

Commit

Permalink
cmake: set PIC using the default variable
Browse files Browse the repository at this point in the history
  • Loading branch information
mathstuf committed Apr 2, 2015
1 parent e09a165 commit 39b9e3e
Show file tree
Hide file tree
Showing 4 changed files with 2 additions and 10 deletions.
1 change: 1 addition & 0 deletions CMakeLists.txt
Expand Up @@ -195,6 +195,7 @@ else()
endforeach ()
endif()

set(CMAKE_POSITION_INDEPENDENT_CODE TRUE)
set(CMAKE_AUTOMOC TRUE)

macro(qt_wrap_ui var)
Expand Down
5 changes: 1 addition & 4 deletions src/CMakeLists.txt
Expand Up @@ -233,8 +233,7 @@ qt_wrap_ui(keepassx_SOURCES ${keepassx_FORMS})

add_library(keepassx_core STATIC ${keepassx_SOURCES})
set_target_properties(keepassx_core PROPERTIES
COMPILE_DEFINITIONS KEEPASSX_BUILDING_CORE
POSITION_INDEPENDENT_CODE ON)
COMPILE_DEFINITIONS KEEPASSX_BUILDING_CORE)

add_executable(${PROGNAME} WIN32 MACOSX_BUNDLE ${keepassx_SOURCES_MAINEXE})
target_link_libraries(${PROGNAME}
Expand All @@ -244,8 +243,6 @@ target_link_libraries(${PROGNAME}
${QT_QTWIDGETS_LIBRARY}
${GCRYPT_LIBRARIES}
${ZLIB_LIBRARIES})
set_target_properties(${PROGNAME} PROPERTIES
POSITION_INDEPENDENT_CODE ON)

if(UNIX AND NOT APPLE)
target_link_libraries(${PROGNAME} ${QT_QTDBUS_LIBRARY})
Expand Down
4 changes: 0 additions & 4 deletions tests/CMakeLists.txt
Expand Up @@ -57,8 +57,6 @@ macro(add_unit_test)
set(_srcList ${TEST_SOURCES})
add_executable(${_test_NAME} ${_srcList})
target_link_libraries(${_test_NAME} ${TEST_LIBS})
set_target_properties(${_test_NAME} PROPERTIES
POSITION_INDEPENDENT_CODE ON)

if(NOT TEST_OUTPUT)
set(TEST_OUTPUT plaintext)
Expand Down Expand Up @@ -101,8 +99,6 @@ endif()

set(modeltest_SOURCRS modeltest.cpp)
add_library(modeltest STATIC ${modeltest_SOURCRS})
set_target_properties(modeltest PROPERTIES
POSITION_INDEPENDENT_CODE ON)

add_unit_test(NAME testgroup SOURCES TestGroup.cpp MOCS TestGroup.h
LIBS ${TEST_LIBRARIES})
Expand Down
2 changes: 0 additions & 2 deletions utils/CMakeLists.txt
Expand Up @@ -24,5 +24,3 @@ target_link_libraries(kdbx-extract
${QT_QTDBUS_LIBRARY}
${GCRYPT_LIBRARIES}
${ZLIB_LIBRARIES})
set_target_properties(kdbx-extract PROPERTIES
POSITION_INDEPENDENT_CODE ON)

0 comments on commit 39b9e3e

Please sign in to comment.