Magellan Linux

Diff of /trunk/include/cmake.sminc

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 30124 by niro, Fri Oct 20 08:24:46 2017 UTC revision 30125 by niro, Fri Oct 27 08:58:33 2017 UTC
# Line 141  cmake_configure() Line 141  cmake_configure()
141   default_opts+=" -DCMAKE_VERBOSE_MAKEFILE=ON"   default_opts+=" -DCMAKE_VERBOSE_MAKEFILE=ON"
142   default_opts+=" -DCMAKE_BUILD_TYPE=Release"   default_opts+=" -DCMAKE_BUILD_TYPE=Release"
143   default_opts+=" -DCMAKE_INSTALL_PREFIX=${PREFIX:-/usr}"   default_opts+=" -DCMAKE_INSTALL_PREFIX=${PREFIX:-/usr}"
144   default_opts+=' -DLIB_SUFFIX=$(cmake_libsuffix)'   if [[ ${MULTILIB_BUILD} = true ]]
145   default_opts+=' -DLIB_INSTALL_DIR=${PREFIX:-/usr}/$(mlibdir)'   then
146     # eval these variables later with the abi-${ABI} caller
147     default_opts+=' -DLIB_SUFFIX=$(cmake_libsuffix)'
148     default_opts+=' -DLIB_INSTALL_DIR=${PREFIX:-/usr}/$(mlibdir)'
149     default_opts+=' -DLIB_SUFFIX=$(cmake_libsuffix)'
150     else
151     # eval these variables now
152     default_opts+=" -DLIB_SUFFIX=$(cmake_libsuffix)"
153     default_opts+=" -DLIB_INSTALL_DIR=${PREFIX:-/usr}/$(mlibdir)"
154     default_opts+=" -DLIB_SUFFIX=$(cmake_libsuffix)"
155     fi
156    
157   if [[ ${MULTILIB_BUILD} = true ]]   if [[ ${MULTILIB_BUILD} = true ]]
158   then   then

Legend:
Removed from v.30124  
changed lines
  Added in v.30125