From 339fe794b01215ae4f7ea474596e637667f3fa9e Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Fri, 11 Mar 2011 10:24:12 +0000
Subject: [PATCH] From Mourad Boufarguine, "There is a redundant cmake code at
 the end of osgViewer cmake script. The install command is issued in
 SETUP_LIBRARY macro." "I spotted this when i tried a make install on the
 android port :) I saw some weird copy commands of osgViewer headers. I
 managed to get all osg headers copied to cmake_install_prefix/include upon
 make install, but i can't (yet) get the libraries to be copied to
 cmake_install_prefix/lib (see attached files)"

---
 CMakeModules/ModuleInstall.cmake | 10 ++++++++++
 CMakeModules/OsgMacroUtils.cmake |  2 +-
 src/osgViewer/CMakeLists.txt     | 10 ----------
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/CMakeModules/ModuleInstall.cmake b/CMakeModules/ModuleInstall.cmake
index 55ccf2d7d..f2ea06707 100644
--- a/CMakeModules/ModuleInstall.cmake
+++ b/CMakeModules/ModuleInstall.cmake
@@ -25,6 +25,14 @@ IF(MSVC AND OSG_MSVC_VERSIONED_DLL)
     HANDLE_MSVC_DLL()
 ENDIF()
 
+IF(ANDROID)
+    INSTALL (
+        FILES        ${TARGET_H}
+        DESTINATION ${INSTALL_INCDIR}/${LIB_NAME}
+        COMPONENT libopenscenegraph-dev
+    )
+ELSE(ANDROID)
+
 INSTALL(
     TARGETS ${LIB_NAME}
     RUNTIME DESTINATION ${INSTALL_BINDIR} COMPONENT libopenscenegraph
@@ -50,3 +58,5 @@ ELSE()
     )
     # MESSAGE("${OSG_COMPILE_FRAMEWORKS_INSTALL_NAME_DIR}")
 ENDIF()
+
+ENDIF(ANDROID)
diff --git a/CMakeModules/OsgMacroUtils.cmake b/CMakeModules/OsgMacroUtils.cmake
index fc948d328..ea80b2f01 100644
--- a/CMakeModules/OsgMacroUtils.cmake
+++ b/CMakeModules/OsgMacroUtils.cmake
@@ -237,8 +237,8 @@ MACRO(SETUP_LIBRARY LIB_NAME)
         ENDIF(TARGET_LIBRARIES_VARS)
         LINK_CORELIB_DEFAULT(${LIB_NAME})
     
-        INCLUDE(ModuleInstall OPTIONAL)
     ENDIF()
+    INCLUDE(ModuleInstall OPTIONAL)
 ENDMACRO(SETUP_LIBRARY LIB_NAME)
 
 MACRO(SETUP_PLUGIN PLUGIN_NAME)
diff --git a/src/osgViewer/CMakeLists.txt b/src/osgViewer/CMakeLists.txt
index d30309300..3218debf2 100644
--- a/src/osgViewer/CMakeLists.txt
+++ b/src/osgViewer/CMakeLists.txt
@@ -249,13 +249,3 @@ IF(MINGW OR CYGWIN)
 ENDIF()
 
 SETUP_LIBRARY(${LIB_NAME})
-
-FOREACH(INCLUDEFILE ${TARGET_H} )
-   FILE(RELATIVE_PATH REL_INCLUDEFILE ${HEADER_PATH} ${INCLUDEFILE})
-   GET_FILENAME_COMPONENT(REL_INCLUDE_PATH ${REL_INCLUDEFILE} PATH)
-   INSTALL(
-   FILES        ${INCLUDEFILE}
-   DESTINATION ${INSTALL_INCDIR}/${LIB_NAME}/${REL_INCLUDE_PATH}
-   COMPONENT libopenscenegraph-dev
-   )
-ENDFOREACH()