Commit 0615ad96 authored by Jens Korinth's avatar Jens Korinth
Browse files

Use global lib dir directly under top-level

* libplatform and libtapasco can be built in the same location now
parent 6f3130de
......@@ -44,3 +44,4 @@ bin/tapasco
bin/tapasco-logviewer
bin/tapasco-reportviewer
/tapasco-status-cache/
/lib/
cmake_minimum_required(VERSION 2.8)
project(arch-axi4mm)
set(CMAKE_INSTALL_PREFIX "..")
if (NOT EXISTS "$ENV{TAPASCO_HOME}")
message(FATAL_ERROR "Please set TAPASCO_HOME environment variable to root directory of Tapasco")
endif (NOT EXISTS "$ENV{TAPASCO_HOME}")
include ("$ENV{TAPASCO_HOME}/cmake/Tapasco.cmake")
set(CMAKE_INSTALL_PREFIX "${TAPASCO_HOME}/lib")
set(SRCDIR "src")
set(CMNDIR "../common/src")
......@@ -26,7 +25,6 @@ set(COMMON_SOURCES "${CMNDIR}/tapasco_delayed_transfers.c"
"${CMNDIR}/tapasco_version.c"
"${TAPASCO_COMMON_DIR}/src/gen_mem.c"
"${TAPASCO_COMMON_DIR}/src/gen_queue.c")
set(TAPASCO_LIBS_DIR "${TAPASCO_HOME}/arch/lib")
include_directories(${TAPASCO_INCDIRS})
include_directories("include" "../common/include" "${PLATFORMDIR}/common/include" "${TAPASCO_COMMON_DIR}/src/include")
......
......@@ -8,7 +8,7 @@ endif (NOT EXISTS "$ENV{TAPASCO_HOME}")
include ("$ENV{TAPASCO_HOME}/cmake/Tapasco.cmake")
add_definitions("-DNPERFC")
set(CMAKE_INSTALL_PREFIX "${TAPASCO_PLATFORM_DIR}")
set(CMAKE_INSTALL_PREFIX "${TAPASCO_HOME}")
set(SRCDIR "src")
set(CMNDIR "common")
......
Supports Markdown
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