diff options
| -rw-r--r-- | CMakeLists.txt | 4 | ||||
| -rw-r--r-- | ConfigureChecks.cmake | 12 |
2 files changed, 4 insertions, 12 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 00cb74c..2f882b4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -25,6 +25,7 @@ include( CheckIncludeFile ) include( CheckLibraryExists ) include( CheckCSourceCompiles ) include( CheckCXXSourceCompiles ) +include( GNUInstallDirs OPTIONAL ) #### include our cmake modules @@ -35,6 +36,9 @@ include( TDEMacros ) ##### setup install paths +if( CMAKE_INSTALL_LIBDIR ) + tde_setup_install_path( LIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}" ) +endif() include( TDESetupPaths ) tde_setup_paths( ) diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake index 5ee5651..b1399ef 100644 --- a/ConfigureChecks.cmake +++ b/ConfigureChecks.cmake @@ -58,15 +58,3 @@ execute_process( ) set( TQT_INCLUDES_DIR ${_includedir} ) 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}" ) |