cmake: Install the library to the default system location.

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 1382f3ddb7)
r14.0.x
Slávek Banko 2 years ago
parent bf076238d3
commit 379367890c
No known key found for this signature in database
GPG Key ID: 608F5293A04BE668

@ -25,6 +25,7 @@ include( CheckIncludeFile )
include( CheckLibraryExists ) include( CheckLibraryExists )
include( CheckCSourceCompiles ) include( CheckCSourceCompiles )
include( CheckCXXSourceCompiles ) include( CheckCXXSourceCompiles )
include( GNUInstallDirs OPTIONAL )
#### include our cmake modules #### include our cmake modules
@ -35,6 +36,9 @@ include( TDEMacros )
##### setup install paths ##### setup install paths
if( CMAKE_INSTALL_LIBDIR )
tde_setup_install_path( LIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}" )
endif()
include( TDESetupPaths ) include( TDESetupPaths )
tde_setup_paths( ) tde_setup_paths( )

@ -58,15 +58,3 @@ execute_process(
) )
set( TQT_INCLUDES_DIR ${_includedir} ) set( TQT_INCLUDES_DIR ${_includedir} )
message( STATUS "TQT include directory: ${TQT_INCLUDES_DIR}" ) message( STATUS "TQT include directory: ${TQT_INCLUDES_DIR}" )
##### Look for tqt3 libraries location
execute_process(
COMMAND ${PKG_CONFIG_EXECUTABLE} tqt-mt --variable=libdir
OUTPUT_VARIABLE _libdir
RESULT_VARIABLE _result
OUTPUT_STRIP_TRAILING_WHITESPACE
)
set( TQT_LIBDIR ${_libdir} )
message( STATUS "TQT libraries directory: ${TQT_LIBDIR}" )

Loading…
Cancel
Save