diff --git a/CMakeLists.txt b/CMakeLists.txt index 7c57693394a9aced1289532d3cb466884ac77fdb..6b8536bc46bda1d3a0754b44eee2aac5a37373d9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -17,6 +17,14 @@ configure_file ( "${PROJECT_SOURCE_DIR}/cmake/cdo_config.h.in" "${PROJECT_BINARY_DIR}/src/config.h" ) +# --- Other compile definitions currently required TEMP +list(APPEND cdo_compile_definitions + restrict= + CDI_SIZE_TYPE=size_t #size type for cdi, in cdo its size_t + YAC_FOR_CDO + HAVE_CONFIG_H=1 + PACKAGE_NAME="${PACKAGE_NAME}") + list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index d11c3dd744460ff476ed2482693ce52c1382e3c3..d7605765e11fbabb5fcff9cf942cfcb30fdf9bff 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -3,13 +3,9 @@ set(VERSION "${CMAKE_PROJECT_VERSION}") add_subdirectory(lib) -list(APPEND cdo_compile_defintions - restrict= - CDI_SIZE_TYPE=size_t - YAC_FOR_CDO - HAVE_CONFIG_H=1 +list(APPEND cdo_compile_definitions VERSION="${VERSION}" - PACKAGE_NAME="${PACKAGE_NAME}") +) # -------- CDO LIB ------------ list( APPEND cdolib_src_files