From 4b14ddedd07824a0322f33415f181d4a0df9907c Mon Sep 17 00:00:00 2001
From: Kjetil Olsen Lye <kjetil.olsen.lye@sintef.no>
Date: Mon, 3 Mar 2014 11:11:48 +0100
Subject: [PATCH] CMAKE: Updated correct targets outputpath.

---
 CMakeLists.txt       | 13 ++++---------
 TiniaConfig.cmake.in | 11 +++--------
 2 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 130782a..499d42f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -243,14 +243,9 @@ SET(CPACK_PACKAGE_VENDOR "SINTEF ICT")
 
 SET(CPACK_PACKAGE_VERSION ${version_number} )
 
-# Only on multiple configuration systems like MSVC and nmake, 
-# we get all configurations included in one targets file,
-# otherwise we use one target file for each configuration
-IF(CMAKE_CONFIGURATION_TYPES) 
-	SET(TINIA_TARGETS_APPEND "")
-ELSE()
-	SET(TINIA_TARGETS_APPEND ${CMAKE_BUILD_TYPE})
-ENDIF()
+
+SET(TINIA_TARGETS_APPEND "")
+
 
 # This is for local build directory:
 IF(Tinia_DESKTOP)
@@ -302,7 +297,7 @@ install(FILES
 
 # Install the export set for use with the install-tree
 install(EXPORT TiniaTargets DESTINATION
-  "${INSTALL_CMAKE_DIR}/TiniaTargets${TINIA_TARGETS_APPEND}.cmake" COMPONENT tinia_dev)
+  "${INSTALL_CMAKE_DIR}/" COMPONENT tinia_dev)
 
 IF(NOT WIN32)
     SET( CPACK_GENERATOR "DEB" )
diff --git a/TiniaConfig.cmake.in b/TiniaConfig.cmake.in
index e7870b1..94ac184 100644
--- a/TiniaConfig.cmake.in
+++ b/TiniaConfig.cmake.in
@@ -27,14 +27,9 @@ IF( Tinia_FIND_COMPONENTS )
   ENDFOREACH()
 ENDIF()
 
-# Only multiple configuration systems like MSVC and nmake, 
-# we get all configurations included in one targets file,
-# otherwise we use one target file for each configuration
-IF(CMAKE_CONFIGURATION_TYPES) 
-	SET(TINIA_TARGETS_APPEND "")
-ELSE()
-	SET(TINIA_TARGETS_APPEND ${CMAKE_BUILD_TYPE})
-ENDIF()
+
+SET(TINIA_TARGETS_APPEND "")
+
 
 # - Config file for the Tinia package
 # It defines the following variables