Commit 76588314ab45694a03ce43bb2727105e432b434a
1 parent
4b95fb97
Exists in
master
and in
10 other branches
Fix bug with cdf dir definition in cmake
Showing
2 changed files
with
4 additions
and
2 deletions
Show diff stats
cmake/modules/FindCDF.cmake
| @@ -19,4 +19,6 @@ ELSE(libcdf_INCLUDE_DIR AND libcdf_LIBRARIES) | @@ -19,4 +19,6 @@ ELSE(libcdf_INCLUDE_DIR AND libcdf_LIBRARIES) | ||
| 19 | message(STATUS "NOT Found libcdf, disabling it") | 19 | message(STATUS "NOT Found libcdf, disabling it") |
| 20 | ENDIF(libcdf_INCLUDE_DIR AND libcdf_LIBRARIES) | 20 | ENDIF(libcdf_INCLUDE_DIR AND libcdf_LIBRARIES) |
| 21 | 21 | ||
| 22 | -MARK_AS_ADVANCED(libcdf_INCLUDE_DIR libcdf_LIBRARIES) | 22 | +get_filename_component(libcdf_LIBRARY_DIR ${libcdf_LIBRARIES} DIRECTORY) |
| 23 | + | ||
| 24 | +MARK_AS_ADVANCED(libcdf_INCLUDE_DIR libcdf_LIBRARY_DIR libcdf_LIBRARIES) |
scripts/StartServer.in
| @@ -6,7 +6,7 @@ DDBASE=/home/budnik/AMDA-NG.core/DDBASE/DATA | @@ -6,7 +6,7 @@ DDBASE=/home/budnik/AMDA-NG.core/DDBASE/DATA | ||
| 6 | DDPATH=/home/budnik/AMDA-NG.core/DDBASE | 6 | DDPATH=/home/budnik/AMDA-NG.core/DDBASE |
| 7 | DDLIB=@CMAKE_INSTALL_PREFIX@/lib | 7 | DDLIB=@CMAKE_INSTALL_PREFIX@/lib |
| 8 | DDBASEBIN=@CMAKE_INSTALL_PREFIX@/bin | 8 | DDBASEBIN=@CMAKE_INSTALL_PREFIX@/bin |
| 9 | -LD_LIBRARY_PATH=$DDLIB/:@NETCDFLIB_DIR@:@libcdf_LIBRARIES@:@USRLIB_DIR@ | 9 | +LD_LIBRARY_PATH=$DDLIB/:@NETCDFLIB_DIR@:@libcdf_LIBRARY_DIR@:@USRLIB_DIR@ |
| 10 | export DDBASE DDPATH DDBASEBIN DDLIB LD_LIBRARY_PATH | 10 | export DDBASE DDPATH DDBASEBIN DDLIB LD_LIBRARY_PATH |
| 11 | 11 | ||
| 12 | #$DDBASEBIN/DD_Server 1>/dev/null 2>/dev/null& | 12 | #$DDBASEBIN/DD_Server 1>/dev/null 2>/dev/null& |