Vous avez reçu un message "Your GitLab account has been locked ..." ? Pas d'inquiétude : lisez cet article https://docs.gricad-pages.univ-grenoble-alpes.fr/help/unlock/

Commit 7bb6edb5 authored by Valentin Touzeau's avatar Valentin Touzeau
Browse files

Fix install and update for last otawa version

parent 74065911
...@@ -52,7 +52,6 @@ execute_process(COMMAND "${OTAWA_CONFIG}" --prefix ...@@ -52,7 +52,6 @@ execute_process(COMMAND "${OTAWA_CONFIG}" --prefix
# plugin definition # plugin definition
set(ORIGIN $ORIGIN) set(ORIGIN $ORIGIN)
include_directories("${CMAKE_SOURCE_DIR}" "include")
add_library(${PLUGIN} SHARED ${SOURCES}) add_library(${PLUGIN} SHARED ${SOURCES})
set_property(TARGET ${PLUGIN} PROPERTY PREFIX "") set_property(TARGET ${PLUGIN} PROPERTY PREFIX "")
set_property(TARGET ${PLUGIN} PROPERTY COMPILE_FLAGS "${OTAWA_CFLAGS} --std=c++11 -g -Wall -Wextra -pedantic") set_property(TARGET ${PLUGIN} PROPERTY COMPILE_FLAGS "${OTAWA_CFLAGS} --std=c++11 -g -Wall -Wextra -pedantic")
...@@ -60,9 +59,11 @@ set_property(TARGET ${PLUGIN} PROPERTY COMPILE_FLAGS "${OTAWA_CFLAGS} --std=c++1 ...@@ -60,9 +59,11 @@ set_property(TARGET ${PLUGIN} PROPERTY COMPILE_FLAGS "${OTAWA_CFLAGS} --std=c++1
add_dependencies(${PLUGIN} libcudd) add_dependencies(${PLUGIN} libcudd)
add_dependencies(${PLUGIN} libextra) add_dependencies(${PLUGIN} libextra)
target_include_directories(${PLUGIN} PUBLIC "${CMAKE_SOURCE_DIR}/include")
target_link_libraries(${PLUGIN} PUBLIC "${OTAWA_LDFLAGS}" cudd_core cudd_epd cudd_st cudd_util extra) target_link_libraries(${PLUGIN} PUBLIC "${OTAWA_LDFLAGS}" cudd_core cudd_epd cudd_st cudd_util extra)
# installation # installation
set(PLUGIN_PATH "${OTAWA_PREFIX}/lib/otawa/${NAMESPACE}") set(PLUGIN_PATH "${OTAWA_PREFIX}/lib/otawa/${NAMESPACE}")
install(TARGETS ${PLUGIN} LIBRARY DESTINATION ${PLUGIN_PATH}) install(TARGETS ${PLUGIN} LIBRARY DESTINATION ${PLUGIN_PATH})
install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/include/exactlru" DESTINATION "${OTAWA_PREFIX}/include")
install(FILES ${PLUGIN}.eld DESTINATION ${PLUGIN_PATH}) install(FILES ${PLUGIN}.eld DESTINATION ${PLUGIN_PATH})
...@@ -7,10 +7,7 @@ using namespace otawa; ...@@ -7,10 +7,7 @@ using namespace otawa;
class Plugin: public ProcessorPlugin { class Plugin: public ProcessorPlugin {
public: public:
using procs_t = elm::genstruct::Table<AbstractRegistration* >;
Plugin(void): ProcessorPlugin("exactlru", Version(1, 0, 0), OTAWA_PROC_VERSION) { } Plugin(void): ProcessorPlugin("exactlru", Version(1, 0, 0), OTAWA_PROC_VERSION) { }
virtual procs_t& processors (void) const { return procs_t::EMPTY; };
}; };
} // namespace exactlru } // namespace exactlru
......
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