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

List:       kde-commits
Subject:    kdesupport/decibel
From:       Dominik Haumann <dhdev () gmx ! de>
Date:       2008-11-17 16:20:17
Message-ID: 1226938817.295734.18894.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 885653 by dhaumann:

fix INCLUDE_INSTALL_DIR if the variable was CACHEd before by another module.
Now include files are installed in include/Decibel again.


 M  +2 -2      CMakeLists.txt  
 M  +1 -1      include/Decibel/CMakeLists.txt  
 M  +1 -1      src/client/Decibel/CMakeLists.txt  
 M  +1 -1      src/pluginhelper/CMakeLists.txt  


--- trunk/kdesupport/decibel/CMakeLists.txt #885652:885653
@@ -80,8 +80,8 @@
 )
 
 SET(INCLUDE_INSTALL_DIR
-    "${CMAKE_INSTALL_PREFIX}/include/Decibel"
-    CACHE PATH "The subdirectory relative to the install prefix for header files \
(default is include/Decibel)." +    "${CMAKE_INSTALL_PREFIX}/include"
+    CACHE PATH "The subdirectory relative to the install prefix for header files \
(default is include)."  )
 
 SET(DEMO_INSTALL_DIR
--- trunk/kdesupport/decibel/include/Decibel/CMakeLists.txt #885652:885653
@@ -20,5 +20,5 @@
     decibel_pluginhelper_export.h
 )
 
-INSTALL(FILES ${decibel_public_HDRS} DESTINATION ${INCLUDE_INSTALL_DIR})
+INSTALL(FILES ${decibel_public_HDRS} DESTINATION ${INCLUDE_INSTALL_DIR}/Decibel)
 
--- trunk/kdesupport/decibel/src/client/Decibel/CMakeLists.txt #885652:885653
@@ -85,7 +85,7 @@
 INSTALL(FILES decibel_export.h
         channelhandler.h
         ${decibelclient_GENHDRS}
-        DESTINATION ${INCLUDE_INSTALL_DIR}
+        DESTINATION ${INCLUDE_INSTALL_DIR}/Decibel
 )
 
 IF (NOT WIN32)
--- trunk/kdesupport/decibel/src/pluginhelper/CMakeLists.txt #885652:885653
@@ -47,5 +47,5 @@
 
 INSTALL(FILES ${decibel_pluginhelper_MOC_HDRS}
               ${decibel_pluginhelper_INSTALL_HDRS}
-        DESTINATION ${INCLUDE_INSTALL_DIR}
+        DESTINATION ${INCLUDE_INSTALL_DIR}/Decibel
 )


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