You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
33 lines
1.2 KiB
33 lines
1.2 KiB
10 years ago
|
From ede40b16ce6b48a02ffda6c4dc56f1aac8590357 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Matthias Klumpp <matthias@tenstral.net>
|
||
|
|
Date: Mon, 8 Sep 2014 21:52:04 +0200
|
||
|
|
Subject: [PATCH 08/16] Fix compilation due to not-set cmake variable
|
||
|
|
|
||
|
|
---
|
||
|
|
CMakeLists.txt | 2 +-
|
||
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||
|
|
index 5df701d..b1e1e97 100755
|
||
|
|
--- a/CMakeLists.txt
|
||
|
|
+++ b/CMakeLists.txt
|
||
|
|
@@ -41,6 +41,7 @@ endif(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
|
||
|
|
#
|
||
|
|
# Configure files
|
||
|
|
#
|
||
|
|
+set (CMAKE_INSTALL_LIBDIR "lib/${CMAKE_LIBRARY_ARCHITECTURE}" CACHE PATH "Output directory for libraries")
|
||
|
|
set (PREFIXDIR "${CMAKE_INSTALL_PREFIX}")
|
||
|
|
set (DATADIR "${CMAKE_INSTALL_PREFIX}/share")
|
||
|
|
set (PKGDATADIR "${DATA_INSTALL_DIR}")
|
||
|
|
@@ -56,7 +57,6 @@ set (CMAKECONFIG_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}/cmake/${LIBNAME}/")
|
||
|
|
add_definitions("-DLOCALSTATEDIR=\"${LOCALSTATEDIR}\"")
|
||
|
|
add_definitions("-std=gnu++11")
|
||
|
|
|
||
|
|
-set(CMAKE_INSTALL_LIBDIR "lib/${CMAKE_LIBRARY_ARCHITECTURE}" CACHE PATH "Output directory for libraries")
|
||
|
|
if (IS_ABSOLUTE ${CMAKE_INSTALL_LIBDIR})
|
||
|
|
set (PKQT_INSTALL_LIBDIR ${CMAKE_INSTALL_LIBDIR})
|
||
|
|
else (IS_ABSOLUTE ${CMAKE_INSTALL_LIBDIR})
|
||
|
|
--
|
||
|
|
2.1.0
|
||
|
|
|