From 4116b341aadfc926dee31e37650ed37957dc3600 Mon Sep 17 00:00:00 2001 From: Kim Kulling Date: Tue, 12 Jul 2016 09:04:38 +0200 Subject: [PATCH] closes https://github.com/assimp/assimp/issues/938: adapt instal pathes. --- CMakeLists.txt | 6 +++--- assimp.pc.in | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8455bb8bc..2b398e0ff 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -136,11 +136,11 @@ IF ( CMAKE_SOURCE_DIR STREQUAL CMAKE_BINARY_DIR ) ENDIF ( CMAKE_SOURCE_DIR STREQUAL CMAKE_BINARY_DIR ) # Cache these to allow the user to override them manually. -SET( ASSIMP_LIB_INSTALL_DIR "lib" CACHE PATH +SET( ASSIMP_LIB_INSTALL_DIR "lib" CACHE STRING "Path the built library files are installed to." ) -SET( ASSIMP_INCLUDE_INSTALL_DIR "include" CACHE PATH +SET( ASSIMP_INCLUDE_INSTALL_DIR "include" CACHE STRING "Path the header files are installed to." ) -SET( ASSIMP_BIN_INSTALL_DIR "bin" CACHE PATH +SET( ASSIMP_BIN_INSTALL_DIR "bin" CACHE STRING "Path the tool executables are installed to." ) IF (CMAKE_BUILD_TYPE STREQUAL "Debug") diff --git a/assimp.pc.in b/assimp.pc.in index ecb7074d3..5b2139e6d 100644 --- a/assimp.pc.in +++ b/assimp.pc.in @@ -1,5 +1,5 @@ prefix=@CMAKE_INSTALL_PREFIX@ -exec_prefix=@CMAKE_INSTALL_PREFIX@/@ASSIMP_BIN_INSTALL_DIR@ +exec_prefix=@CMAKE_INSTALL_PREFIX@/ libdir=@CMAKE_INSTALL_PREFIX@/@ASSIMP_LIB_INSTALL_DIR@ includedir=@CMAKE_INSTALL_PREFIX@/@ASSIMP_INCLUDE_INSTALL_DIR@/assimp