Commit a3e53b6a authored by mjg226's avatar mjg226
Browse files

bug fixing and updating asciigrid for GDAL usage

parent e6b8d751
...@@ -260,8 +260,6 @@ CAAPI_add_source_dir(impls\\\\specific "${CAAPI_SPECIFIC_IMPL_DIR}/*.ca" ...@@ -260,8 +260,6 @@ CAAPI_add_source_dir(impls\\\\specific "${CAAPI_SPECIFIC_IMPL_DIR}/*.ca"
set(CAAPI_IMPL_INCLUDE_DIRS) set(CAAPI_IMPL_INCLUDE_DIRS)
set(CAAPI_IMPL_LIBRARIES) 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 # Execute the module for the specific implementation
if(EXISTS "${CAAPI_SPECIFIC_IMPL_DIR}/extra/CAAPI_impl.cmake") if(EXISTS "${CAAPI_SPECIFIC_IMPL_DIR}/extra/CAAPI_impl.cmake")
...@@ -271,6 +269,10 @@ 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) CAAPI_impl("${CAAPI_SPECIFIC_IMPL_DIR}" CAAPI_IMPL_INCLUDE_DIRS CAAPI_IMPL_LIBRARIES)
endif() 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 # Execute the module that manage the common ca for the specific implementation
if(EXISTS "${CAAPI_SPECIFIC_IMPL_DIR}/extra/CAAPI_ca.cmake") 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 ...@@ -286,6 +288,8 @@ add_custom_target(caapi_do_impl_headers ALL DEPENDS ${CAAPI_CAHEADERS} ${CAAPI_H
# Add the needed directories into the compilation # Add the needed directories into the compilation
include_directories(${CAAPI_IMPL_INCLUDE_DIRS}) include_directories(${CAAPI_IMPL_INCLUDE_DIRS})
message(STATUS "Include dir: ${CAAPI_IMPL_INCLUDE_DIRS}")
########################## CAPI DEVICE common files ########################## ########################## CAPI DEVICE common files ##########################
......
...@@ -30,7 +30,7 @@ else() ...@@ -30,7 +30,7 @@ else()
add_definitions( -DCAAPI_IMPL_VERSION=${CAAPI_IMPL_VERSION} ) add_definitions( -DCAAPI_IMPL_VERSION=${CAAPI_IMPL_VERSION} )
endif() endif()
if (WIN32) if (WIN32 AND NOT MINGW)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /openmp") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /openmp")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /openmp") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /openmp")
else() else()
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment