Skip to content
Snippets Groups Projects
Commit f88cf8f2 authored by Oliver Heidmann's avatar Oliver Heidmann
Browse files

fixed typo

parent 8bc6637b
No related branches found
No related tags found
1 merge request!312CMake Improvements and fixes
......@@ -26,14 +26,14 @@ message("Start check for pthread")
include(FindThreads)
find_package(Threads REQUIRED)
set_target_properties(Threads::Threads PROPERTIES THREADS_PREFER_PTHREAD_FLAG TRUE)
list(APPEND cdo_compile_defintions HAVE_LIBPTHREAD=1)
list(APPEND cdo_compile_definitions HAVE_LIBPTHREAD=1)
### -------------- WordExp ---------------------------
message("Start check for wordexp")
set(wordexp_flag HAVE_WORDEXP_H)
check_include_files("wordexp.h" ${wordexp_flag})
IF(${wordexp_flag})
list(APPEND cdo_compile_defintions ${wordexp_flag}=1)
list(APPEND cdo_compile_definitions ${wordexp_flag}=1)
ELSE()
message("wordexp.h is not found" )
ENDIF()
......@@ -43,7 +43,7 @@ option(ENABLE_PROJ "Enable projection library, use -DPROJ_ROOT for specific path
if(ENABLE_PROJ OR PROJ_ROOT)
find_package(PROJ)
if(PROJ4::proj)
list(APPEND cdo_compile_defintions HAVE_PROJ=${PROJ_FOUND})
list(APPEND cdo_compile_definitions HAVE_PROJ=${PROJ_FOUND})
endif()
endif()
......@@ -70,7 +70,7 @@ find_package(netCDF 4.0 REQUIRED)
if (TARGET netCDF::netcdf)
message(DEBUG "Checking for netCDF_HAS_NC4 flag equal 'yes' : flag is: ${netCDF_HAS_NC4}")
list(APPEND cdo_compile_defintions HAVE_NETCDF=${netCDF_FOUND})
list(APPEND cdo_compile_definitions HAVE_NETCDF=${netCDF_FOUND})
else()
message(WARNING "Netcdf not found, compiling without netcdf")
endif ()
......@@ -85,7 +85,7 @@ if(CMOR_ROOT)
message("CMOR requirements found: checking cmor itself")
find_package(CMOR)
if(TARGET CMOR::CMOR)
list(APPEND cdo_compile_defintions "HAVE_LIBCMOR=1")
list(APPEND cdo_compile_definitions "HAVE_LIBCMOR=1")
endif()
endif()
# ----------------------------------------------------------------------
......
......@@ -364,7 +364,7 @@ target_include_directories(cdolib PRIVATE "${PROJECT_SOURCE_DIR}/src/mpim_grid"
"${PROJECT_SOURCE_DIR}/libcdi/src"
)
target_link_libraries(cdolib Threads::Threads netCDF::netcdf CMOR::CMOR)
target_compile_definitions(cdolib PRIVATE ${cdo_compile_defintions})
target_compile_definitions(cdolib PRIVATE ${cdo_compile_definitions})
# --------------- CDO OPERATORS --------------------------------
......@@ -598,7 +598,7 @@ list( APPEND cdo_operators_src_files
add_library(operators ${cdo_operators_src_files})
target_link_libraries(operators PRIVATE cdolib cdilib yac gradsdes healpix CMOR::CMOR )
target_compile_definitions(operators PRIVATE ${cdo_compile_defintions})
target_compile_definitions(operators PRIVATE ${cdo_compile_definitions})
target_include_directories(operators PRIVATE
"${PROJECT_SOURCE_DIR}/src/mpim_grid"
......@@ -609,7 +609,7 @@ target_include_directories(operators PRIVATE
list( APPEND cdo_src_files cdo.cc)
add_executable(cdo ${cdo_src_files})
target_compile_definitions(cdo PRIVATE ${cdo_compile_defintions})
target_compile_definitions(cdo PRIVATE ${cdo_compile_definitions})
target_link_libraries(cdo PRIVATE "$<LINK_LIBRARY:WHOLE_ARCHIVE,operators>")
target_link_libraries(cdo PRIVATE cdolib cdilib yac gradsdes healpix pthread CMOR::CMOR json-c Uuid::uuid)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment