File patch0002-GNUInstallDirs.diff of Package neko

Overview Repositories Revisions Requests Users Attributes Meta

File patch0002-GNUInstallDirs.diff of Package neko (Revision f06973618901c689ed137952b282910a)

Currently displaying revision f06973618901c689ed137952b282910a , Show latest

From dbf8bc0c3d13774d08c144c09f2eb93d80ed0358 Mon Sep 17 00:00:00 2001
From: Andy Li <andy@onthewings.net>
Date: Wed, 18 May 2016 02:14:52 +0800
Subject: [PATCH] [CMake] use GNUInstallDirs ...instead of figuring the vars
 out manually.

---
 CMakeLists.txt | 21 +++++----------------
 1 file changed, 5 insertions(+), 16 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4159a7a..382ef3e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1203,18 +1203,6 @@ add_custom_target(source_archive_fat
 
 # install target
 
-if (NOT DEFINED LIB_INSTALL_DIR)
-	if (DEFINED CMAKE_INSTALL_LIBDIR)
-		set(LIB_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR})
-	else (DEFINED LIB_INSTALL_DIR)
-		set(LIB_INSTALL_DIR "lib")
-	endif()
-endif()
-
-if (NOT DEFINED INCLUDE_INSTALL_DIR)
-	set(INCLUDE_INSTALL_DIR "include")
-endif()
-
 if (WIN32)
 	set(DEST_BIN .)
 	set(DEST_LIB .)
@@ -1233,10 +1221,11 @@ if (WIN32)
 		set (CMAKE_INSTALL_PREFIX "C:/HaxeToolkit/neko" CACHE PATH "default install path" FORCE)
 	endif()
 else()
-	set(DEST_BIN bin)
-	set(DEST_LIB ${LIB_INSTALL_DIR})
-	set(DEST_NDLL ${LIB_INSTALL_DIR}/neko)
-	set(DEST_INCLUDE ${INCLUDE_INSTALL_DIR})
+	include(GNUInstallDirs)
+	set(DEST_BIN ${CMAKE_INSTALL_BINDIR})
+	set(DEST_LIB ${CMAKE_INSTALL_LIBDIR})
+	set(DEST_NDLL ${CMAKE_INSTALL_LIBDIR}/neko)
+	set(DEST_INCLUDE ${CMAKE_INSTALL_INCLUDEDIR})
 endif()
 
 install (
-- 
2.6.4

Places

File patch0002-GNUInstallDirs.diff of Package neko (Revision f06973618901c689ed137952b282910a)

Places