CMakeLists.txt

@@ -159,7 +159,7 @@ MACRO(print_conf_summary)
 	IF(CMAKE_PREFIX_PATH)
 		MESSAGE(STATUS "\tCMake Prefix Path:\t\t" "${CMAKE_PREFIX_PATH}")
 	ENDIF()
-	MESSAGE(STATUS "\tUsing pnetcdf:\t\t\t" ${STATUS_PNETCDF})
+	MESSAGE(STATUS "\tUsing pnetcdf:\t\t\t" ${STATUS_PNETCDF}, "\t" ${PNETCDF_INCLUDE_DIR})
 	MESSAGE(STATUS "\tUsing Parallel IO:\t\t" ${STATUS_PARALLEL})
 	MESSAGE(STATUS "\tLinking against:\t\t" "${ALL_TLL_LIBS}") 
 	#MESSAGE("CPACK_SOURCE_IGNORE_FILES: ${CPACK_SOURCE_IGNORE_FILES}")
@@ -468,12 +468,13 @@ IF(ENABLE_PNETCDF)
 	# Does the user want to turn on PNETCDF read ability?
 	SET(USE_PNETCDF ON CACHE BOOL "")	
 	FIND_LIBRARY(PNETCDF NAMES pnetcdf)
+	FIND_PATH(PNETCDF_INCLUDE_DIR pnetcdf.h)
 	IF(NOT PNETCDF)
 		MESSAGE(STATUS "Cannot find pnetcdf library. Disabling pnetcdf support.")
 		SET(USE_PNETCDF OFF CACHE BOOL "")
 	ENDIF()
 	SET(STATUS_PNETCDF "ON")	
-
+	INCLUDE_DIRECTORIES(${PNETCDF_INCLUDE_DIR})
 ENDIF()
 
 

liblib/CMakeLists.txt

@@ -35,7 +35,14 @@ ENDIF()
 #####
 # Add dependencies required for linking.
 #####
-SET(TLL_LIBS ${HAVE_LIBM} ${ZLIB_LIBRARY})
+
+SET(TLL_LIBS "")
+
+SET(TLL_LIBS ${TLL_LIBS} ${HAVE_LIBM} ${ZLIB_LIBRARY})
+
+IF(USE_HDF5 OR USE_NETCDF4)
+	    SET(TLL_LIBS ${HDF5_LIBRARIES} ${TLL_LIBS} ${SZIP_LIBRARY})	
+ENDIF()
 
 IF(USE_DAP)
 	SET(TLL_LIBS ${TLL_LIBS} ${CURL_LIBRARIES})
@@ -45,9 +52,6 @@ IF(USE_HDF4)
 	SET(TLL_LIBS ${TLL_LIBS} ${HDF4_LIBRARIES})
 ENDIF()
 
-IF(USE_HDF5 OR USE_NETCDF4)
-	    SET(TLL_LIBS ${TLL_LIBS} ${SZIP_LIBRARY} ${HDF5_LIBRARIES})	
-ENDIF()
 
 IF(ENABLE_PNETCDF AND PNETCDF)
 	SET(TLL_LIBS ${TLL_LIBS} ${PNETCDF})

nc_test4/CMakeLists.txt

@@ -60,6 +60,6 @@ IF(TEST_PARALLEL)
 ENDIF()	
 
 IF(USE_PNETCDF)
-	add_bin_test(nc_test4 tst_parallel2)
-	add_sh_test(nc_test4 run_pnetcdf_test)
+	add_bin_test_no_prefix(tst_parallel2)
+	#add_sh_test(nc_test4 run_pnetcdf_test)
 ENDIF()