From e9f2abaf6c61850b5588281edfd387c92b883e2a Mon Sep 17 00:00:00 2001 From: Chow Loong Jin Date: Wed, 23 May 2012 05:50:32 +0800 Subject: [PATCH] Use GNUInstallDirs for CMAKE_INSTALL_*DIR --- CMakeLists.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 494aaca..5a40a2d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,6 +2,7 @@ cmake_minimum_required(VERSION 2.6 FATAL_ERROR) cmake_policy(VERSION 2.6) project(tinyxml2) +include(GNUInstallDirs) #enable_testing() #CMAKE_BUILD_TOOL @@ -60,7 +61,7 @@ add_dependencies(test tinyxml2) add_dependencies(test ${TARGET_DATA_COPY}) target_link_libraries(test tinyxml2) -SET(CMAKE_INSTALL_LIBDIR lib CACHE PATH "") + IF(BUILD_STATIC_LIBS) INSTALL(TARGETS tinyxml2 tinyxml2static LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} @@ -69,6 +70,6 @@ ELSE(BUILD_STATIC_LIBS) INSTALL(TARGETS tinyxml2 LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) ENDIF(BUILD_STATIC_LIBS) -INSTALL(FILES tinyxml2.h DESTINATION include) +INSTALL(FILES tinyxml2.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) #add_test(test ${SAMPLE_NAME} COMMAND $)