[SCM] OCE packaging branch, debian, updated. debian/0.11-1

Denis Barbier bouzim at gmail.com
Thu Dec 13 19:16:24 UTC 2012


The following commit has been merged in the debian branch:
commit 4d823a4e6bcf968037b5401b48f3ee8bf4c8a9f9
Author: Denis Barbier <bouzim at gmail.com>
Date:   Thu Aug 2 10:03:45 2012 +0200

    Replace CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES by CMAKE_CXX_IMPLICIT_LINK_DIRECTORIES
    
    Brad King explained at http://bugs.debian.org/683484#10 that we should not use
    this variable, it is undocumented, but use CMAKE_CXX_IMPLICIT_LINK_DIRECTORIES
    instead.

diff --git a/adm/cmake/BuildToolkit.cmake b/adm/cmake/BuildToolkit.cmake
index ec8e7fa..4aaf5ac 100644
--- a/adm/cmake/BuildToolkit.cmake
+++ b/adm/cmake/BuildToolkit.cmake
@@ -144,7 +144,7 @@ MACRO(SET_TARGET_PROPERTIES_INSTALL_RPATH target dirs)
 		SET(non_system_paths "")
 		FOREACH(dir ${dirs})
 			LIST(FIND CMAKE_INSTALL_RPATH "${dir}" _exists)
-			LIST(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${dir}" _isSystem)
+			LIST(FIND CMAKE_CXX_IMPLICIT_LINK_DIRECTORIES "${dir}" _isSystem)
 			IF("${_exists}" LESS 0 AND "${_isSystem}" LESS 0)
 				LIST(APPEND non_system_paths "${dir}")
 			ENDIF("${_exists}" LESS 0 AND "${_isSystem}" LESS 0)

-- 
OCE packaging



More information about the debian-science-commits mailing list