From 8f0fe234ac49dc96ab0c9066d6dd730888b7a015 Mon Sep 17 00:00:00 2001 From: Even Rouault Date: Sat, 21 Feb 2015 14:08:23 +0000 Subject: src/bin_nad2bin.cmake: backward test for nad2nad warning. bad directory specified for emess (from Charles Karney) git-svn-id: http://svn.osgeo.org/metacrs/proj/trunk@2621 4e78687f-474d-0410-85f9-8d5e500ac6b2 --- ChangeLog | 4 ++++ src/bin_nad2bin.cmake | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 79eb3258..c5c95b15 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2015-02-21 Even Rouault + * src/bin_nad2bin.cmake: backward test for nad2nad warning. + bad directory specified for emess (from Charles Karney) + 2015-02-21 Even Rouault * man/man1/proj.1 man/man1/cs2cs.1 man/man1/geod.1 man/man3/pj_init.3: fix various issues (#259) diff --git a/src/bin_nad2bin.cmake b/src/bin_nad2bin.cmake index 9f62f6c7..57cbfe21 100644 --- a/src/bin_nad2bin.cmake +++ b/src/bin_nad2bin.cmake @@ -1,12 +1,12 @@ -if(WIN32 AND NOT BUILD_LIBPROJ_SHARED) +if(WIN32 AND BUILD_LIBPROJ_SHARED) message(warning " nad2nad can't be build with a DLL proj4 library you need a static lib") -endif(WIN32 AND NOT BUILD_LIBPROJ_SHARED) +endif(WIN32 AND BUILD_LIBPROJ_SHARED) set(NAD2BIN_SRC nad2bin.c) source_group("Source Files\\Bin" FILES ${NAD2BIN_SRC}) if(WIN32) - set(NAD2BIN_SRC ${NAD2BIN_SRC} ${NAD2BIN_SRC}/emess.c) + set(NAD2BIN_SRC ${NAD2BIN_SRC} emess.c) endif(WIN32) #Executable -- cgit v1.2.3