[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    =?utf-8?q?=5Bgluon=5D_/=3A_Use_=24=7BLIB=5FINSTALL=5FDIR=7D_agai?=
From:       Johannes Obermayr <johannesobermayr () gmx ! de>
Date:       2011-01-28 22:17:29
Message-ID: 20110128221729.DABE0A6094 () git ! kde ! org
[Download RAW message or body]

Git commit b41e2f0d8bacee581a96672ddda5c1f64a103978 by Johannes Obermayr.
Pushed by jobermayr into branch 'master'.

Use ${LIB_INSTALL_DIR} again.
It is neccessary for installing in ${PREFIX}/lib${SUFFIX} and was removed with commit \
237b5f74499b456815c3e3775186e99ad7647be9.

M  +1    -1    audio/CMakeLists.txt     
M  +2    -2    core/CMakeLists.txt     
M  +1    -1    creator/lib/CMakeLists.txt     
M  +1    -1    engine/CMakeLists.txt     
M  +1    -1    graphics/CMakeLists.txt     
M  +1    -1    input/CMakeLists.txt     
M  +1    -1    player/CMakeLists.txt     

http://commits.kde.org/fad2ae7b/b41e2f0d8bacee581a96672ddda5c1f64a103978

diff --git a/audio/CMakeLists.txt b/audio/CMakeLists.txt
index 018f0b3..8ec7c28 100644
--- a/audio/CMakeLists.txt
+++ b/audio/CMakeLists.txt
@@ -115,7 +115,7 @@ if(APPLE)
 	set(MACOSX_FRAMEWORK_BUNDLE_VERSION ${GLUON_VERSION_STRING})
 endif()
 
-install(TARGETS GluonAudio RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE \
DESTINATION lib) +install(TARGETS GluonAudio RUNTIME DESTINATION bin LIBRARY \
DESTINATION {LIB_INSTALL_DIR} ARCHIVE ARCHIVE DESTINATION {LIB_INSTALL_DIR} ARCHIVE)  \
  install(
     FILES
diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt
index a18f70c..523ba1f 100644
--- a/core/CMakeLists.txt
+++ b/core/CMakeLists.txt
@@ -99,11 +99,11 @@ if(APPLE)
 	set(MACOSX_FRAMEWORK_BUNDLE_VERSION ${GLUON_VERSION_STRING})
 endif()
 
-install(TARGETS GluonCore RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE \
DESTINATION lib) +install(TARGETS GluonCore RUNTIME DESTINATION bin LIBRARY \
DESTINATION {LIB_INSTALL_DIR} ARCHIVE ARCHIVE DESTINATION {LIB_INSTALL_DIR} ARCHIVE)  \
  install(
     FILES
     ${GluonCore_HEADERS}
     DESTINATION ${INCLUDE_INSTALL_DIR}/gluon/core
     COMPONENT Devel
-)
\ No newline at end of file
+)
diff --git a/creator/lib/CMakeLists.txt b/creator/lib/CMakeLists.txt
index 925fe3f..730718b 100644
--- a/creator/lib/CMakeLists.txt
+++ b/creator/lib/CMakeLists.txt
@@ -57,7 +57,7 @@ set(GLUON_CREATOR_LIBS
     CACHE PATHS "Libraries required for Gluon Creator"
 )
 
-install(TARGETS libGluonCreator RUNTIME DESTINATION bin LIBRARY DESTINATION lib \
ARCHIVE DESTINATION lib) +install(TARGETS libGluonCreator RUNTIME DESTINATION bin \
LIBRARY DESTINATION {LIB_INSTALL_DIR} ARCHIVE ARCHIVE DESTINATION \
lib{LIB_INSTALL_DIR})  
 install(FILES
     plugin.h
diff --git a/engine/CMakeLists.txt b/engine/CMakeLists.txt
index 3fa60fa..06677d0 100644
--- a/engine/CMakeLists.txt
+++ b/engine/CMakeLists.txt
@@ -114,7 +114,7 @@ set(GLUON_ENGINE_LIBS
     CACHE PATHS "Libraries required for Gluon Engine"
 )
 
-install(TARGETS GluonEngine RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE \
DESTINATION lib) +install(TARGETS GluonEngine RUNTIME DESTINATION bin LIBRARY \
DESTINATION {LIB_INSTALL_DIR} ARCHIVE ARCHIVE DESTINATION {LIB_INSTALL_DIR} ARCHIVE)  \
  install(
     FILES
diff --git a/graphics/CMakeLists.txt b/graphics/CMakeLists.txt
index 47a053e..2c7a93c 100644
--- a/graphics/CMakeLists.txt
+++ b/graphics/CMakeLists.txt
@@ -161,7 +161,7 @@ if(INSTALL_EXAMPLES)
     add_subdirectory(examples)
 endif()
 
-install(TARGETS GluonGraphics RUNTIME DESTINATION bin LIBRARY DESTINATION lib \
ARCHIVE DESTINATION lib) +install(TARGETS GluonGraphics RUNTIME DESTINATION bin \
LIBRARY DESTINATION {LIB_INSTALL_DIR} ARCHIVE ARCHIVE DESTINATION {LIB_INSTALL_DIR} \
ARCHIVE)  
 install(FILES
     ${GluonGraphics_HEADERS}
diff --git a/input/CMakeLists.txt b/input/CMakeLists.txt
index df12f4e..e8b177f 100644
--- a/input/CMakeLists.txt
+++ b/input/CMakeLists.txt
@@ -219,7 +219,7 @@ elseif(UNIX)
 else()
 endif()
 
-install(TARGETS GluonInput RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE \
DESTINATION lib) +install(TARGETS GluonInput RUNTIME DESTINATION bin LIBRARY \
DESTINATION {LIB_INSTALL_DIR} ARCHIVE ARCHIVE DESTINATION {LIB_INSTALL_DIR} ARCHIVE)  \
  if(APPLE)
     install(
diff --git a/player/CMakeLists.txt b/player/CMakeLists.txt
index 5841447..de75c19 100644
--- a/player/CMakeLists.txt
+++ b/player/CMakeLists.txt
@@ -96,7 +96,7 @@ else(LIBATTICA_FOUND)
     )
 endif(LIBATTICA_FOUND)
 
-install(TARGETS GluonPlayer RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE \
DESTINATION lib) +install(TARGETS GluonPlayer RUNTIME DESTINATION bin LIBRARY \
DESTINATION {LIB_INSTALL_DIR} ARCHIVE ARCHIVE DESTINATION {LIB_INSTALL_DIR} ARCHIVE)  \
  add_subdirectory(qt)
 


[prev in list] [next in list] [prev in thread] [next in thread] 

Configure | About | News | Add a list | Sponsored by KoreLogic