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

List:       kde-commits
Subject:    =?utf-8?q?=5Bgluon=5D_/=3A_Fix_ARCHIVE_ARCHIVE_introduced_by_my_?=
From:       Johannes Obermayr <johannesobermayr () gmx ! de>
Date:       2011-01-28 22:36:10
Message-ID: 20110128223610.470E5A6094 () git ! kde ! org
[Download RAW message or body]

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

Fix ARCHIVE ARCHIVE introduced by my last commit.

M  +1    -1    audio/CMakeLists.txt     
M  +1    -1    core/CMakeLists.txt     
M  +2    -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/5c78fbad1b574e014e308bdde129535a6ee703c5

diff --git a/audio/CMakeLists.txt b/audio/CMakeLists.txt
index 8ec7c28..8a82b3e 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_INSTALL_DIR} ARCHIVE ARCHIVE DESTINATION {LIB_INSTALL_DIR} ARCHIVE) \
+install(TARGETS GluonAudio RUNTIME DESTINATION bin LIBRARY DESTINATION \
{LIB_INSTALL_DIR} ARCHIVE DESTINATION {LIB_INSTALL_DIR})  
 install(
     FILES
diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt
index 523ba1f..2b2697d 100644
--- a/core/CMakeLists.txt
+++ b/core/CMakeLists.txt
@@ -99,7 +99,7 @@ if(APPLE)
 	set(MACOSX_FRAMEWORK_BUNDLE_VERSION ${GLUON_VERSION_STRING})
 endif()
 
-install(TARGETS GluonCore RUNTIME DESTINATION bin LIBRARY DESTINATION \
{LIB_INSTALL_DIR} ARCHIVE ARCHIVE DESTINATION {LIB_INSTALL_DIR} ARCHIVE) \
+install(TARGETS GluonCore RUNTIME DESTINATION bin LIBRARY DESTINATION \
{LIB_INSTALL_DIR} ARCHIVE DESTINATION {LIB_INSTALL_DIR})  
 install(
     FILES
diff --git a/creator/lib/CMakeLists.txt b/creator/lib/CMakeLists.txt
index 730718b..f880cab 100644
--- a/creator/lib/CMakeLists.txt
+++ b/creator/lib/CMakeLists.txt
@@ -57,7 +57,8 @@ set(GLUON_CREATOR_LIBS
     CACHE PATHS "Libraries required for Gluon Creator"
 )
 
-install(TARGETS libGluonCreator RUNTIME DESTINATION bin LIBRARY DESTINATION \
{LIB_INSTALL_DIR} ARCHIVE ARCHIVE DESTINATION lib{LIB_INSTALL_DIR}) +install(TARGETS \
libGluonCreator RUNTIME DESTINATION bin LIBRARY DESTINATION {LIB_INSTALL_DIR} ARCHIVE \
DESTINATION {LIB_INSTALL_DIR}) +
 
 install(FILES
     plugin.h
diff --git a/engine/CMakeLists.txt b/engine/CMakeLists.txt
index 06677d0..af9ac12 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_INSTALL_DIR} ARCHIVE ARCHIVE DESTINATION {LIB_INSTALL_DIR} ARCHIVE) \
+install(TARGETS GluonEngine RUNTIME DESTINATION bin LIBRARY DESTINATION \
{LIB_INSTALL_DIR} ARCHIVE DESTINATION {LIB_INSTALL_DIR})  
 install(
     FILES
diff --git a/graphics/CMakeLists.txt b/graphics/CMakeLists.txt
index 2c7a93c..1c127ba 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_INSTALL_DIR} ARCHIVE ARCHIVE DESTINATION {LIB_INSTALL_DIR} ARCHIVE) \
+install(TARGETS GluonGraphics RUNTIME DESTINATION bin LIBRARY DESTINATION \
{LIB_INSTALL_DIR} ARCHIVE DESTINATION {LIB_INSTALL_DIR})  
 install(FILES
     ${GluonGraphics_HEADERS}
diff --git a/input/CMakeLists.txt b/input/CMakeLists.txt
index e8b177f..271f524 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_INSTALL_DIR} ARCHIVE ARCHIVE DESTINATION {LIB_INSTALL_DIR} ARCHIVE) \
+install(TARGETS GluonInput RUNTIME DESTINATION bin LIBRARY DESTINATION \
{LIB_INSTALL_DIR} ARCHIVE DESTINATION {LIB_INSTALL_DIR})  
 if(APPLE)
     install(
diff --git a/player/CMakeLists.txt b/player/CMakeLists.txt
index de75c19..56a3b42 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_INSTALL_DIR} ARCHIVE ARCHIVE DESTINATION {LIB_INSTALL_DIR} ARCHIVE) \
+install(TARGETS GluonPlayer RUNTIME DESTINATION bin LIBRARY DESTINATION \
{LIB_INSTALL_DIR} ARCHIVE DESTINATION {LIB_INSTALL_DIR})  
 add_subdirectory(qt)
 


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