Reverted removal 'get_target_property' to discover ARCHIVE_OUTPUT_DIR…

…ECTORY.

If 'CMAKE_ARCHIVE_OUTPUT_DIRECTORY' is used to customize the output
folders of oce-win-bundle libraries, the oce build will set
FREETYPE_LIBRARY and related variables to the wrong paths.

This patch fixes that bug.

The commit that inserted this removal in the first place
(tpaviot#465) did not provide any explination
for it.

CMakeLists.txt

@@ -918,9 +918,8 @@ else(WIN32)
 	set(_PSUFFIX "")
 endif(WIN32)
 
-# If OCE_USE_BUNDLE_SOURCE, then we need to add oce-win-bundle and set it
-# to build into the same destination directories as OCE. This cannot run
-# until LIBRARY_OUTPUT_PATH is set above
+# If OCE_USE_BUNDLE_SOURCE, then we need to add oce-win-bundle and set variables
+# so the oce build can find the various headers and libraries.
 if (OCE_USE_BUNDLE_SOURCE AND OCE_BUNDLE_ROOT_PATH)
 	# Embed oce-win-bundle project into this CMake project
 	message("Using OCE Bundle in same CMake project")
@@ -936,8 +935,8 @@ if (OCE_USE_BUNDLE_SOURCE AND OCE_BUNDLE_ROOT_PATH)
 		set(FREETYPE_INCLUDE_DIR_freetype2 ${OCE_BUNDLE_ROOT_PATH}/libs/freetype CACHE PATH "" FORCE)
 		set(FREETYPE_INCLUDE_DIR_ft2build ${OCE_BUNDLE_ROOT_PATH}/libs/freetype/include CACHE PATH "" FORCE)
 		set(FREETYPE_INCLUDE_DIRS ${FREETYPE_INCLUDE_DIR_freetype2} ${FREETYPE_INCLUDE_DIR_ft2build})
-		
-		set(FREETYPE_ARCHIVE_OUTPUT_DIRECTORY ${LIBRARY_OUTPUT_PATH})
+
+		get_target_property(FREETYPE_ARCHIVE_OUTPUT_DIRECTORY freetype ARCHIVE_OUTPUT_DIRECTORY)
 
 		if(MINGW)
 			set(FREETYPE_LIBRARY ${FREETYPE_ARCHIVE_OUTPUT_DIRECTORY}/${CMAKE_CFG_INTDIR}/libfreetype.dll.a CACHE FILEPATH "" FORCE)
@@ -950,7 +949,7 @@ if (OCE_USE_BUNDLE_SOURCE AND OCE_BUNDLE_ROOT_PATH)
 		endif(MINGW)
 
 		if(OCE_WITH_GL2PS)
-			set(GL2PS_ARCHIVE_OUTPUT_DIRECTORY ${LIBRARY_OUTPUT_PATH})
+			get_target_property(GL2PS_ARCHIVE_OUTPUT_DIRECTORY gl2ps ARCHIVE_OUTPUT_DIRECTORY)
 
 			if(MINGW)
 				set(GL2PS_LIBRARY ${GL2PS_ARCHIVE_OUTPUT_DIRECTORY}/${CMAKE_CFG_INTDIR}/libgl2ps.dll.a CACHE FILEPATH "" FORCE)
@@ -964,7 +963,7 @@ if (OCE_USE_BUNDLE_SOURCE AND OCE_BUNDLE_ROOT_PATH)
 		endif(OCE_WITH_GL2PS)
 
 		if(OCE_WITH_FREEIMAGE)
-			set(FREEIMAGE_ARCHIVE_OUTPUT_DIRECTORY ${LIBRARY_OUTPUT_PATH})
+			get_target_property(FREEIMAGE_ARCHIVE_OUTPUT_DIRECTORY FreeImage ARCHIVE_OUTPUT_DIRECTORY)
 
 			if(MINGW)
 				set(FREEIMAGE_LIBRARY ${FREEIMAGE_ARCHIVE_OUTPUT_DIRECTORY}/${CMAKE_CFG_INTDIR}/libFreeImage.dll.a CACHE FILEPATH "" FORCE)
@@ -974,7 +973,7 @@ if (OCE_USE_BUNDLE_SOURCE AND OCE_BUNDLE_ROOT_PATH)
 				set(FREEIMAGE_LIBRARY_DEBUG ${FREEIMAGE_ARCHIVE_OUTPUT_DIRECTORY}/${CMAKE_CFG_INTDIR}/FreeImaged.lib CACHE FILEPATH "" FORCE)
 			endif(MINGW)
 
-			set(FREEIMAGEPLUS_ARCHIVE_OUTPUT_DIRECTORY ${LIBRARY_OUTPUT_PATH})
+			get_target_property(FREEIMAGEPLUS_ARCHIVE_OUTPUT_DIRECTORY FreeImagePlus ARCHIVE_OUTPUT_DIRECTORY)
 
 			if(MINGW)
 				set(FREEIMAGEPLUS_LIBRARY ${FREEIMAGEPLUS_ARCHIVE_OUTPUT_DIRECTORY}/${CMAKE_CFG_INTDIR}/libFreeImagePlus.dll.a CACHE FILEPATH "" FORCE)