phynexis-deps/cgal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cygwin fixes

Browse Source 
fixed adaptive copying of previous configuration settings
This commit is contained in:
Fernando Cacciola
2008-03-14 12:55:18 +00:00
parent 55b1c90e6b
commit 4d995d8280
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Scripts/developer_scripts/autotest_cgal_with_cmake
+5 -2
View File
@@ -225,7 +225,7 @@ build_cgal_libs()
fi
remote_command ${1} "cd ${CGAL_BINARY_DIR}; \
cmake ${CMAKE_GENERATOR} -DWITH_demo=FALSE -DWITH_examples=FALSE -DWITH_CGALPDB=FALSE ../../..; \
cmake \"${CMAKE_GENERATOR}\" -DWITH_demo=FALSE -DWITH_examples=FALSE -DWITH_CGALPDB=FALSE ../../..; \
${MAKE_CMD} -fMakefile" >> ${ACTUAL_LOGFILE} 2>&1
if [ -f "${CGAL_BINARY_DIR}/CMakeFiles/CMakeError.log" ]; then
@@ -410,7 +410,10 @@ copy_old_stuff()
# If there is any configuration cached in the old release, copy it
if [ -f "${platform}/CMakeCache.txt" ]; then
log ${ACTUAL_LOGFILE} "Copying old ${platform}/CMakeCache.txt into ${CGAL_BINARY_DIR_BASE}/${platform}/"
sed "s/${OLD_CGAL_RELEASE_ID}/${CGAL_RELEASE_ID}/g" "${platform}/CMakeCache.txt" >> "${CGAL_BINARY_DIR_BASE}/${platform}/CMakeCache.txt"
sed -e "s,${OLD_CGAL_RELEASE_ID}/cmake/platform,${CGAL_RELEASE_ID}/cmake/platform,g" \
-e "s,${OLD_CGAL_RELEASE_ID}$,${CGAL_RELEASE_ID},g" \
"${platform}/CMakeCache.txt" \
>> "${CGAL_BINARY_DIR_BASE}/${platform}/CMakeCache.txt"
fi
fi