Revision: 12864
http://sourceforge.net/p/plplot/code/12864
Author: airwin
Date: 2013-12-13 19:27:57 +0000 (Fri, 13 Dec 2013)
Log Message:
-----------
Make filter_rpath function robust against the case where none of
CMAKE_C_IMPLICIT_LINK_DIRECTORIES,
CMAKE_CXX_IMPLICIT_LINK_DIRECTORIES, or
CMAKE_FORTRAN_IMPLICIT_LINK_DIRECTORIES are defined. This should
never happen according to the CMake documentation, but Phil apparently
found a case where it did happen for the "Visual Studio 11" generator
(for VS2012). My conclusion is that generator is severely broken, but
nevertheless making this function robust for the case when none of
these variables are defined cannot be a bad thing to do.
Modified Paths:
--------------
trunk/cmake/modules/plplot_functions.cmake
Modified: trunk/cmake/modules/plplot_functions.cmake
===================================================================
--- trunk/cmake/modules/plplot_functions.cmake 2013-12-13 18:27:43 UTC (rev 12863)
+++ trunk/cmake/modules/plplot_functions.cmake 2013-12-13 19:27:57 UTC (rev 12864)
@@ -207,8 +207,12 @@
${CMAKE_CXX_IMPLICIT_LINK_DIRECTORIES}
${CMAKE_FORTRAN_IMPLICIT_LINK_DIRECTORIES}
)
- list(REMOVE_DUPLICATES directories_to_be_removed)
+
if(directories_to_be_removed)
+ list(REMOVE_DUPLICATES directories_to_be_removed)
+ endif(directories_to_be_removed)
+
+ if(directories_to_be_removed)
list(REMOVE_ITEM internal_rpath ${directories_to_be_removed})
endif(directories_to_be_removed)
endif(internal_rpath)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
