Skip to content

Commit

Permalink
Merge branch '5.4' of https://github.com/GenericMappingTools/gmt into…
Browse files Browse the repository at this point in the history
… 5.4
  • Loading branch information
joa-quim committed Jan 2, 2019
2 parents f21d390 + 3084351 commit 0b1ae4f
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions cmake/dist/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -170,11 +170,11 @@ if (WIN32 AND NOT CYGWIN)
if (WIN32 AND TRUE)
# Install the gmtmex on Windows. Need to make this work via variables in ConfigUser.cmake
if (BITAGE EQUAL 64)
install (PROGRAMS "C:/progs_cygw/GMTdev/gmt-mex/branches/5.4/src/gmtmex.mexw64" DESTINATION ${GMT_BINDIR} COMPONENT Runtime)
install (PROGRAMS ${GMTMEX_PATH}/gmtmex.mexw64 DESTINATION ${GMT_BINDIR} COMPONENT Runtime)
else ()
install (PROGRAMS "C:/progs_cygw/GMTdev/gmt-mex/branches/5.4/src/gmtmex.mexw32" DESTINATION ${GMT_BINDIR} COMPONENT Runtime)
install (PROGRAMS ${GMTMEX_PATH}/gmtmex.mexw32 DESTINATION ${GMT_BINDIR} COMPONENT Runtime)
endif ()
install (PROGRAMS "C:/progs_cygw/GMTdev/gmt-mex/branches/5.4/src/gmt.m" DESTINATION ${GMT_BINDIR} COMPONENT Runtime)
install (PROGRAMS ${GMTMEX_PATH}/../../src/gmt.m DESTINATION ${GMT_BINDIR} COMPONENT Runtime)
endif (WIN32 AND TRUE)

# Fix bundle:
Expand Down

0 comments on commit 0b1ae4f

Please sign in to comment.