Commit b5807ce0 authored by Mateusz Rychlicki's avatar Mateusz Rychlicki
Browse files

Fix library, messages and cudd

parent 0bdbabee
......@@ -3,21 +3,19 @@ project(FairSyn VERSION 1.0)
set(CMAKE_CXX_STANDARD 11) # Enable c++11 standard
set(CMAKE_CXX_FLAGS "-O0 -Wall -Wextra -std=c++11 -Wfatal-errors -g -ldl --coverage -pthread") #-lgcov?
set(CMAKE_VERBOSE_MAKEFILE ON) # show everything
message("CMAKELIST: Root")
message("CMAKELIST: FaiSyn")
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -O0")
set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -O0")
set(FAIRSYN_ROOT ${PROJECT_SOURCE_DIR})
message("FAIRSYN_ROOT:" + ${FAIRSYN_ROOT})
set(ENV_VARIABLES env.sh)
set(CUDD_PATH "/home/mrychlicki/Desktop/cudd")
set(MASCOT_ROOT "/home/mrychlicki/Desktop/mascot-sds")
set(CUDD_LIBRARY_PATH "/home/mrychlicki/libraries/lib")
set(LD_LIBRARY_PATH "/home/mrychlicki/libraries/lib")
set(GOOGLE_TEST_PATH "/home/mrychlicki/Desktop/googletest")
set(SYLVAN_PATH "/home/mrychlicki/libraries")
set(SYLVAN_PATH "/home/mrychlicki/Desktop/sylvan")
set(CMAKE_BINARY_DIR ${FAIRSYN_ROOT}/build)
set(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR}/bin)
......@@ -25,8 +23,10 @@ set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/bin)
include_directories(${FAIRSYN_ROOT}/ubdd)
include_directories(
${SYLVAN_PATH}/lib
${SYLVAN_PATH}/include)
${SYLVAN_PATH}/*
${SYLVAN_PATH}/src
)
include_directories(
${CUDD_PATH}
${CUDD_PATH}/include
......@@ -36,13 +36,7 @@ include_directories(
${CUDD_PATH}/dddmph)
include_directories(${CUDD_LIBRARY_PATH})
#include_directories(
# ${HOAF_LIB_PATH}/
# ${HOAF_LIB_PATH}/cpphoafparser
# ${HOAF_LIB_PATH}/cpphoafparser/consumer
# ${HOAF_LIB_PATH}/cpphoafparser/parser
# ${HOAF_LIB_PATH}/cpphoafparser/util
# ${HOAF_LIB_PATH}/cpphoafparser/ast)
add_subdirectory(${FAIRSYN_ROOT}/ubdd)
add_subdirectory(${FAIRSYN_ROOT}/tests)
message("CMAKELIST: Tests")
message("CMAKELIST: FaiSyn.tests")
include(GoogleTest) # For Terminal
find_package(GTest REQUIRED) # For Clion
......@@ -13,16 +13,7 @@ add_executable(FairSynTests
tests.cpp)
gtest_add_tests(TARGET FairSynTests)
set_target_properties(FairSynTests PROPERTIES LINKER_LANGUAGE CXX)
add_library(cudd STATIC IMPORTED)
set_property(TARGET cudd PROPERTY IMPORTED_LOCATION ${CUDD_LIBRARY_PATH}/libcudd.a)
target_link_libraries(FairSynTests cudd)
add_library(sylvan STATIC IMPORTED)
set_property(TARGET sylvan PROPERTY IMPORTED_LOCATION ${LD_LIBRARY_PATH}/libSylvan.a)
target_link_libraries(FairSynTests sylvan)
target_link_libraries(FairSynTests GTest::GTest GTest::Main)
target_link_libraries(FairSynTests UBDD)
cmake_minimum_required(VERSION 3.9.1)
message("CMAKELIST: FaiSyn.UBDD")
project(UBDD VERSION 1.0.1 DESCRIPTION "Universal Binary Decision Diagrams ")
add_library(UBDD STATIC
add_library(UBDD STATIC # STATIC OR SHARED
BaseUBDD.hh
CuddUBDD.hh
SylvanUBDD.hh
......@@ -11,9 +12,11 @@ add_library(UBDD STATIC
set_target_properties(UBDD PROPERTIES LINKER_LANGUAGE CXX VERSION ${PROJECT_VERSION})
add_library(cudd STATIC IMPORTED)
set_property(TARGET cudd PROPERTY IMPORTED_LOCATION ${LD_LIBRARY_PATH}/libcudd.a)
set_property(TARGET cudd PROPERTY IMPORTED_LOCATION ${CUDD_LIBRARY_PATH}/libcudd.a)
target_link_libraries(UBDD cudd)
add_library(sylvan STATIC IMPORTED)
set_property(TARGET sylvan PROPERTY IMPORTED_LOCATION ${LD_LIBRARY_PATH}/libSylvan.a)
target_link_libraries(UBDD sylvan)
\ No newline at end of file
set_property(TARGET sylvan PROPERTY IMPORTED_LOCATION ${SYLVAN_PATH}/libSylvan.a)
target_link_libraries(UBDD sylvan)
#target_include_directories(UBDD PRIVATE .)
\ No newline at end of file
......@@ -8,10 +8,11 @@
#ifndef SYLVANUBDDMINTERMITERATOR_HH_
#define SYLVANUBDDMINTERMITERATOR_HH_
#include <vector>
#include "UBDDMintermIterator.hh"
#include "sylvan_obj.hpp"
#include <vector>
#include "sylvan_bdd.h"
......
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