Merge branch 'develop' into 'develop'

Develop See merge request !27

Merge branch 'develop' into 'develop'
Develop See merge request !27
6471d0c6 · Sylvain Thery · aac63fd5 · 57766e9f · 6471d0c6
Commit 6471d0c6 authored Jan 12, 2015 by Sylvain Thery
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

ThirdParty/CMakeLists.txt ThirdParty/CMakeLists.txt +4 -2

No files found.
--- a/ThirdParty/CMakeLists.txt
+++ b/ThirdParty/CMakeLists.txt
@@ -82,5 +82,7 @@ IF (WITH_TINYXML2)
 		INSTALL_COMMAND make install
 	)
 	INSTALL (DIRECTORY TinyXml2/include/ DESTINATION ${CGoGN_ROOT_DIR}/ThirdParty/include)
-	INSTALL (DIRECTORY TinyXml2/lib/ DESTINATION ${CGoGN_ROOT_DIR}/lib/${CMAKE_BUILD_TYPE})
-ENDIF (WITH_TINYXML2)
\ No newline at end of file
+	FILE(GLOB_RECURSE tinyLib_files ${CGoGN_ROOT_DIR}/ThirdParty/TinyXml2/lib/*.so.* ${CGoGN_ROOT_DIR}/ThirdParty/TinyXml2/lib/*.a )
+	INSTALL (FILES ${tinyLib_files} DESTINATION ${CGoGN_ROOT_DIR}/lib/${CMAKE_BUILD_TYPE})
+
+ENDIF (WITH_TINYXML2)	
\ No newline at end of file