diff options
| -rw-r--r-- | CMakeLists.txt | 11 | ||||
| -rw-r--r-- | flow/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | flow/gsl/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | gmcop/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | mcop/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | qtmcop/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | soundserver/CMakeLists.txt | 2 |
7 files changed, 14 insertions, 17 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 7afbb66..96d138f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -43,13 +43,10 @@ include( TDEMacros ) tde_set_project_version( ) -##### paths setup ############################### +##### setup install paths ####################### -tde_setup_install_path( EXEC_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}" ) -tde_setup_install_path( BIN_INSTALL_DIR "${EXEC_INSTALL_PREFIX}/bin" ) -tde_setup_install_path( LIB_INSTALL_DIR "${EXEC_INSTALL_PREFIX}/lib${LIB_SUFFIX}" ) -tde_setup_install_path( INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/include/${CMAKE_PROJECT_NAME}" ) -tde_setup_install_path( PKGCONFIG_INSTALL_DIR "${LIB_INSTALL_DIR}/pkgconfig" ) +include( TDESetupPaths ) +tde_setup_paths( ) ##### user requested options #################### @@ -108,7 +105,7 @@ else( ) endif( ) string( REGEX REPLACE "^${CMAKE_INSTALL_PREFIX}" "\${prefix}" PC_EXEC_PREFIX ${EXEC_INSTALL_PREFIX} ) -string( REGEX REPLACE "^${CMAKE_INSTALL_PREFIX}" "\${prefix}" PC_INCLUDE_DIR ${INCLUDE_INSTALL_DIR} ) +string( REGEX REPLACE "^${CMAKE_INSTALL_PREFIX}" "\${prefix}" PC_INCLUDE_DIR ${INCLUDE_INSTALL_DIR}/${CMAKE_PROJECT_NAME} ) string( REGEX REPLACE "^${CMAKE_INSTALL_PREFIX}" "\${prefix}" PC_LIB_DIR ${LIB_INSTALL_DIR} ) configure_file( arts.pc.cmake arts.pc @ONLY ) install( FILES ${CMAKE_CURRENT_BINARY_DIR}/arts.pc DESTINATION ${PKGCONFIG_INSTALL_DIR} ) diff --git a/flow/CMakeLists.txt b/flow/CMakeLists.txt index 48fb330..14a72aa 100644 --- a/flow/CMakeLists.txt +++ b/flow/CMakeLists.txt @@ -32,7 +32,7 @@ install( FILES fft.h artsflow.idl audioio.h resample.h cpuinfo.h bufferqueue.h gslschedule.h ${CMAKE_CURRENT_BINARY_DIR}/artsflow.h - DESTINATION ${INCLUDE_INSTALL_DIR} ) + DESTINATION ${INCLUDE_INSTALL_DIR}/${CMAKE_PROJECT_NAME} ) ##### other data ################################ diff --git a/flow/gsl/CMakeLists.txt b/flow/gsl/CMakeLists.txt index b3370fd..65bd0e6 100644 --- a/flow/gsl/CMakeLists.txt +++ b/flow/gsl/CMakeLists.txt @@ -41,7 +41,7 @@ install( FILES gslengine.h gslwaveosc.h gslwavechunk.h gsldatahandle-mad.h gslosctable.h gsloscillator.h ${CMAKE_CURRENT_BINARY_DIR}/gslconfig.h - DESTINATION ${INCLUDE_INSTALL_DIR}/gsl ) + DESTINATION ${INCLUDE_INSTALL_DIR}/${CMAKE_PROJECT_NAME}/gsl ) ##### gsl (static lib) ########################## diff --git a/gmcop/CMakeLists.txt b/gmcop/CMakeLists.txt index be4a05c..15aea7e 100644 --- a/gmcop/CMakeLists.txt +++ b/gmcop/CMakeLists.txt @@ -18,9 +18,9 @@ include_directories( ##### headers ################################### -install( FILES - giomanager.h - DESTINATION ${INCLUDE_INSTALL_DIR} ) +install( + FILES giomanager.h + DESTINATION ${INCLUDE_INSTALL_DIR}/${CMAKE_PROJECT_NAME} ) ##### gmcop (shared lib) ######################## diff --git a/mcop/CMakeLists.txt b/mcop/CMakeLists.txt index 0d28932..3f156e0 100644 --- a/mcop/CMakeLists.txt +++ b/mcop/CMakeLists.txt @@ -44,7 +44,7 @@ install( FILES weakreference.h dynamicrequest.h anyref.h debug.h delayedreturn.h dynamicskeleton.h thread.h core.idl ${CMAKE_CURRENT_BINARY_DIR}/arts_export.h - DESTINATION ${INCLUDE_INSTALL_DIR} ) + DESTINATION ${INCLUDE_INSTALL_DIR}/${CMAKE_PROJECT_NAME} ) ##### mcop (shared library) ##################### diff --git a/qtmcop/CMakeLists.txt b/qtmcop/CMakeLists.txt index 721a627..57c9402 100644 --- a/qtmcop/CMakeLists.txt +++ b/qtmcop/CMakeLists.txt @@ -27,9 +27,9 @@ link_directories( ##### headers ################################### -install( FILES - qiomanager.h - DESTINATION ${INCLUDE_INSTALL_DIR} ) +install( + FILES qiomanager.h + DESTINATION ${INCLUDE_INSTALL_DIR}/${CMAKE_PROJECT_NAME} ) ##### qtmcop ############################## diff --git a/soundserver/CMakeLists.txt b/soundserver/CMakeLists.txt index a3caa15..4395447 100644 --- a/soundserver/CMakeLists.txt +++ b/soundserver/CMakeLists.txt @@ -38,7 +38,7 @@ install( FILES ${CMAKE_CURRENT_BINARY_DIR}/artsversion.h ${CMAKE_CURRENT_BINARY_DIR}/soundserver.h ${CMAKE_CURRENT_BINARY_DIR}/kmedia2.h - DESTINATION ${INCLUDE_INSTALL_DIR} ) + DESTINATION ${INCLUDE_INSTALL_DIR}/${CMAKE_PROJECT_NAME} ) ##### other data ################################ |