Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
caddies
caddies-api
Commits
a3e53b6a
Commit
a3e53b6a
authored
Apr 27, 2020
by
mjg226
Browse files
bug fixing and updating asciigrid for GDAL usage
parent
e6b8d751
Changes
3
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
943 deletions
+10
-943
CMakeLists.txt
CMakeLists.txt
+6
-2
impls/square-cell/vn-neighbours/1-levels/openmp/extra/CAAPI_impl.cmake
...cell/vn-neighbours/1-levels/openmp/extra/CAAPI_impl.cmake
+1
-1
impls/square-cell/vn-neighbours/1-levels/simple/ESRI_ASCIIGrid.hpp
...are-cell/vn-neighbours/1-levels/simple/ESRI_ASCIIGrid.hpp
+3
-940
No files found.
CMakeLists.txt
View file @
a3e53b6a
...
...
@@ -260,8 +260,6 @@ CAAPI_add_source_dir(impls\\\\specific "${CAAPI_SPECIFIC_IMPL_DIR}/*.ca"
set
(
CAAPI_IMPL_INCLUDE_DIRS
)
set
(
CAAPI_IMPL_LIBRARIES
)
# Add the implementation dir to the includ dirs
list
(
APPEND CAAPI_IMPL_INCLUDE_DIRS
${
CAAPI_SPECIFIC_IMPL_DIR
}
)
# Execute the module for the specific implementation
if
(
EXISTS
"
${
CAAPI_SPECIFIC_IMPL_DIR
}
/extra/CAAPI_impl.cmake"
)
...
...
@@ -271,6 +269,10 @@ if(EXISTS "${CAAPI_SPECIFIC_IMPL_DIR}/extra/CAAPI_impl.cmake")
CAAPI_impl
(
"
${
CAAPI_SPECIFIC_IMPL_DIR
}
"
CAAPI_IMPL_INCLUDE_DIRS CAAPI_IMPL_LIBRARIES
)
endif
()
# Add the implementation dir to the includ dirs
list
(
APPEND CAAPI_IMPL_INCLUDE_DIRS
${
CAAPI_SPECIFIC_IMPL_DIR
}
)
# Execute the module that manage the common ca for the specific implementation
if
(
EXISTS
"
${
CAAPI_SPECIFIC_IMPL_DIR
}
/extra/CAAPI_ca.cmake"
)
...
...
@@ -286,6 +288,8 @@ add_custom_target(caapi_do_impl_headers ALL DEPENDS ${CAAPI_CAHEADERS} ${CAAPI_H
# Add the needed directories into the compilation
include_directories
(
${
CAAPI_IMPL_INCLUDE_DIRS
}
)
message
(
STATUS
"Include dir:
${
CAAPI_IMPL_INCLUDE_DIRS
}
"
)
########################## CAPI DEVICE common files ##########################
...
...
impls/square-cell/vn-neighbours/1-levels/openmp/extra/CAAPI_impl.cmake
View file @
a3e53b6a
...
...
@@ -30,7 +30,7 @@ else()
add_definitions
(
-DCAAPI_IMPL_VERSION=
${
CAAPI_IMPL_VERSION
}
)
endif
()
if
(
WIN32
)
if
(
WIN32
AND NOT MINGW
)
set
(
CMAKE_CXX_FLAGS
"
${
CMAKE_CXX_FLAGS
}
/openmp"
)
set
(
CMAKE_C_FLAGS
"
${
CMAKE_C_FLAGS
}
/openmp"
)
else
()
...
...
impls/square-cell/vn-neighbours/1-levels/simple/ESRI_ASCIIGrid.hpp
View file @
a3e53b6a
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment