Make branch compile under cmake

Author: DennisHeimbigner

cf.cmake

@@ -16,8 +16,9 @@ DAP=1
 
 if test "x$VS" != x ; then
 FLAGS="-DCMAKE_PREFIX_PATH=c:/tools/nccmake"
+else
+FLAGS="$FLAGS -DCMAKE_INSTALL_PREFIX=`pwd`/ignore"
 fi
-FLAGS="$FLAGS -DCMAKE_INSTALL_PREFIX=d:/ignore"
 
 if test "x$DAP" = x ; then
 FLAGS="$FLAGS -DENABLE_DAP=false"

libdap4/CMakeLists.txt

@@ -1,4 +1,4 @@
-SET(dap4_SOURCES d4crc32.c d4curlfunctions.c d4curlflags.c d4rc.c d4fix.c d4data.c d4file.c d4parser.c d4meta.c d4varx.c d4dump.c d4swap.c d4chunk.c d4printer.c d4read.c d4http.c d4util.c d4odom.c d4cvt.c d4debug.c ncd4dispatch.c ezxml_extra.c ezxml.c)
+SET(dap4_SOURCES d4crc32.c d4curlfunctions.c d4curlflags.c d4fix.c d4data.c d4file.c d4parser.c d4meta.c d4varx.c d4dump.c d4swap.c d4chunk.c d4printer.c d4read.c d4http.c d4util.c d4odom.c d4cvt.c d4debug.c ncd4dispatch.c ezxml_extra.c ezxml.c)
 
 add_library(dap4 OBJECT ${dap4_SOURCES})
 

libdispatch/CMakeLists.txt

@@ -1,4 +1,4 @@
-SET(libdispatch_SOURCES dparallel.c dcopy.c dfile.c ddim.c datt.c dattinq.c dattput.c dattget.c derror.c dvar.c dvarget.c dvarput.c dvarinq.c ddispatch.c nclog.c dstring.c dutf8.c dinternal.c doffsets.c ncuri.c nclist.c ncbytes.c nchashmap.c nctime.c nc.c nclistmgr.c utf8proc.h utf8proc.c dwinpath.c dutil.c)
+SET(libdispatch_SOURCES dparallel.c dcopy.c dfile.c ddim.c datt.c dattinq.c dattput.c dattget.c derror.c dvar.c dvarget.c dvarput.c dvarinq.c ddispatch.c nclog.c dstring.c dutf8.c dinternal.c doffsets.c ncuri.c nclist.c ncbytes.c nchashmap.c nctime.c nc.c nclistmgr.c utf8proc.h utf8proc.c dwinpath.c dutil.c drc.c dauth.c)
 
 IF(USE_NETCDF4)
   SET(libdispatch_SOURCES ${libdispatch_SOURCES} dgroup.c dvlen.c dcompound.c dtype.c denum.c dopaque.c ncaux.c)

libdispatch/ddispatch.c

@@ -71,9 +71,6 @@ NCDISPATCH_initialize(void)
 	NC_coord_zero[i] = 0;
     }
 
-    /* Load RC File */
-    status = NC_rcload();
-
     /* Capture temp dir*/
     {
 	char* tempdir;
@@ -133,6 +130,8 @@ NCDISPATCH_initialize(void)
 #endif
     }
 
+    /* Now load RC File */
+    status = NC_rcload();
     ncloginit();
 
     return status;

oc2/CMakeLists.txt

@@ -1,4 +1,4 @@
-SET(oc_SOURCES oc.c daplex.c dapparse.c dapy.c occlientparams.c occompile.c occurlfunctions.c ocdata.c ocdebug.c ocdump.c ocinternal.c ocnode.c ochttp.c ocrc.c ocread.c ocutil.c occurlflags.c xxdr.c)
+SET(oc_SOURCES oc.c daplex.c dapparse.c dapy.c occlientparams.c occompile.c occurlfunctions.c ocdata.c ocdebug.c ocdump.c ocinternal.c ocnode.c ochttp.c ocread.c ocutil.c occurlflags.c xxdr.c)
 
 add_library(oc2 OBJECT ${oc_SOURCES})