Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
C
cdo
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Analyze
Contributor analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
mpim-sw
cdo
Commits
f88cf8f2
Commit
f88cf8f2
authored
2 months ago
by
Oliver Heidmann
Browse files
Options
Downloads
Patches
Plain Diff
fixed typo
parent
8bc6637b
No related branches found
Branches containing commit
No related tags found
1 merge request
!312
CMake Improvements and fixes
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
CMakeLists.txt
+5
-5
5 additions, 5 deletions
CMakeLists.txt
src/CMakeLists.txt
+3
-3
3 additions, 3 deletions
src/CMakeLists.txt
with
8 additions
and
8 deletions
CMakeLists.txt
+
5
−
5
View file @
f88cf8f2
...
...
@@ -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_defin
i
tions 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_defin
i
tions
${
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_defin
i
tions 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_defin
i
tions 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_defin
i
tions
"HAVE_LIBCMOR=1"
)
endif
()
endif
()
# ----------------------------------------------------------------------
...
...
This diff is collapsed.
Click to expand it.
src/CMakeLists.txt
+
3
−
3
View file @
f88cf8f2
...
...
@@ -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_defin
i
tions
}
)
# --------------- 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_defin
i
tions
}
)
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_defin
i
tions
}
)
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
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment