Skip to content
Snippets Groups Projects
Commit 5e284d6d authored by Christophe Geuzaine's avatar Christophe Geuzaine
Browse files

trying to fix unix2dos, again

parent 04cc6542
Branches
Tags
No related merge requests found
...@@ -630,9 +630,13 @@ macro(unix2dos VARNAME) ...@@ -630,9 +630,13 @@ macro(unix2dos VARNAME)
set(UNIX2DOS_FILES) set(UNIX2DOS_FILES)
foreach(FILE ${${VARNAME}}) foreach(FILE ${${VARNAME}})
file(READ ${FILE} F0) file(READ ${FILE} F0)
string(REGEX REPLACE "\n" "\r\n" F1 "${F0}")
get_filename_component(N ${FILE} NAME) get_filename_component(N ${FILE} NAME)
if(CYGWIN)
string(REGEX REPLACE "\n" "\r\n" F1 "${F0}")
file(WRITE ${CMAKE_BINARY_DIR}/unix2dos/${N} "${F1}") file(WRITE ${CMAKE_BINARY_DIR}/unix2dos/${N} "${F1}")
else(CYGWIN) # if not in cygwin, assume cmake does it for us
file(WRITE ${CMAKE_BINARY_DIR}/unix2dos/${N} "${F0}")
endif(CYGWIN)
list(APPEND UNIX2DOS_FILES ${CMAKE_BINARY_DIR}/unix2dos/${N}) list(APPEND UNIX2DOS_FILES ${CMAKE_BINARY_DIR}/unix2dos/${N})
endforeach(FILE) endforeach(FILE)
set(${VARNAME} ${UNIX2DOS_FILES}) set(${VARNAME} ${UNIX2DOS_FILES})
...@@ -641,14 +645,12 @@ endmacro(unix2dos) ...@@ -641,14 +645,12 @@ endmacro(unix2dos)
if(WIN32) if(WIN32)
set(GMSH_BIN .) set(GMSH_BIN .)
set(GMSH_DOC .) set(GMSH_DOC .)
if(CYGWIN)
unix2dos(GMSH_API) unix2dos(GMSH_API)
unix2dos(WELCOME_FILE) unix2dos(WELCOME_FILE)
unix2dos(LICENSE_FILE) unix2dos(LICENSE_FILE)
unix2dos(CREDITS_FILE) unix2dos(CREDITS_FILE)
unix2dos(TUTORIAL_FILES) unix2dos(TUTORIAL_FILES)
unix2dos(DEMO_FILES) unix2dos(DEMO_FILES)
endif(CYGWIN)
else(WIN32) else(WIN32)
set(GMSH_BIN bin) set(GMSH_BIN bin)
set(GMSH_DOC share/doc/gmsh) set(GMSH_DOC share/doc/gmsh)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment