Skip to content

Commit

Permalink
Merge pull request #131 from tum-ei-eda/feat_update_elfio
Browse files Browse the repository at this point in the history
update ELFIO version to one that supports CMake
  • Loading branch information
Rafael Stahl authored Feb 23, 2023
2 parents d1bebd3 + 6e3950f commit 40c0b92
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 6 deletions.
13 changes: 7 additions & 6 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -227,14 +227,16 @@ set(ETISS_HEADER ${ETISS_HEADER} ${TMP_CONFIG_HEADER_REL})


include(FetchContent)
### elfio
FetchContent_Declare(elfio_srcs
GIT_REPOSITORY https://github.com/serge1/ELFIO.git
GIT_TAG Release_3.6
GIT_REPOSITORY https://github.com/serge1/ELFIO.git
GIT_TAG Release_3.11
)
if(NOT elfio_srcs_POPULATED)
FetchContent_Populate(elfio_srcs)
FetchContent_GetProperties(elfio_srcs)
FetchContent_Populate(elfio_srcs)
FetchContent_GetProperties(elfio_srcs)
endif()
add_subdirectory(${elfio_srcs_SOURCE_DIR} ${elfio_srcs_BINARY_DIR} EXCLUDE_FROM_ALL)

### simpleini
FetchContent_Declare(simpleini_srcs
Expand Down Expand Up @@ -382,9 +384,8 @@ TARGET_INCLUDE_DIRECTORIES(ETISS PUBLIC
"${PROJECT_SOURCE_DIR}/include_c"
"${PROJECT_BINARY_DIR}/include_c"
${INCGEN_INC_DIR}
${elfio_srcs_SOURCE_DIR}
)
TARGET_LINK_LIBRARIES(ETISS PUBLIC simpleini)
TARGET_LINK_LIBRARIES(ETISS PUBLIC simpleini elfio)

GENERATE_EXPORT_HEADER(ETISS
BASE_NAME ETISS_PLUGIN
Expand Down
1 change: 1 addition & 0 deletions src/SimpleMemSystem.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@
#define MAX_MEMSEGS 99

using namespace etiss;
using namespace ELFIO;

std::unordered_map<std::string, uint32_t> map_messageCounter;
uint32_t printMessage(std::string key, std::string message, uint32_t maxCount)
Expand Down

0 comments on commit 40c0b92

Please sign in to comment.