From 20eadc85f3ed6e958442eec88d8a25dac1f1ea83 Mon Sep 17 00:00:00 2001 From: Jean-Paul Chaput Date: Fri, 17 Nov 2017 15:32:30 +0100 Subject: [PATCH] Bug: LEF/DEF includes in the wrong place. --- bootstrap/cmake_modules/FindLEFDEF.cmake | 6 +- crlcore/python/helpers/Alliance.py | 3 +- lefdef/src/def/def/CMakeLists.txt | 93 +----------------------- lefdef/src/def/defzlib/CMakeLists.txt | 2 +- lefdef/src/lef/lef/CMakeLists.txt | 46 +----------- lefdef/src/lef/lefzlib/CMakeLists.txt | 2 +- 6 files changed, 8 insertions(+), 144 deletions(-) diff --git a/bootstrap/cmake_modules/FindLEFDEF.cmake b/bootstrap/cmake_modules/FindLEFDEF.cmake index 79b58e2f..a686c56e 100644 --- a/bootstrap/cmake_modules/FindLEFDEF.cmake +++ b/bootstrap/cmake_modules/FindLEFDEF.cmake @@ -77,16 +77,16 @@ "/soc/oa" ) message( "-- Components of LEFDEF_DIR_SEARCH:" ) - foreach( PATH ${LEFDEF_DIR_SEARCH} ) + foreach( PATH ${LEFDEF_SEARCH_PATH} ) message( "-- ${PATH}" ) endforeach() set( LEFDEF_LIBRARIES "" ) set( LEFDEF_LIBRARY_SEARCH_PATH "" ) - find_path( LEFDEF_INCLUDE_DIR NAMES "defiDefs.h" + find_path( LEFDEF_INCLUDE_DIR NAMES "defiDefs.hpp" PATHS ${LEFDEF_SEARCH_PATH} - PATH_SUFFIXES "include" "include/lefdef" + PATH_SUFFIXES "include/lefdef" "include" DOC "The ${LEFDEF_INCLUDE_DIR_DESCRIPTION}" ) message( STATUS "LEFDEF_INCLUDE_DIR: ${LEFDEF_INCLUDE_DIR}" ) diff --git a/crlcore/python/helpers/Alliance.py b/crlcore/python/helpers/Alliance.py index b107236e..70fcadee 100644 --- a/crlcore/python/helpers/Alliance.py +++ b/crlcore/python/helpers/Alliance.py @@ -27,10 +27,9 @@ from CRL import AllianceFramework from CRL import RoutingGauge from CRL import RoutingLayerGauge from CRL import CellGauge +import helpers from helpers import ErrorMessage from helpers import Debug -import helpers.RealTechnology -import helpers.SymbolicTechnology allianceFile = '' diff --git a/lefdef/src/def/def/CMakeLists.txt b/lefdef/src/def/def/CMakeLists.txt index a382f24a..c5ceed20 100644 --- a/lefdef/src/def/def/CMakeLists.txt +++ b/lefdef/src/def/def/CMakeLists.txt @@ -92,95 +92,4 @@ set_target_properties ( def PROPERTIES VERSION 5.8 SOVERSION 5 ) install ( TARGETS def DESTINATION lib${LIB_SUFFIX} ) - install ( FILES ${includes} DESTINATION include/def ) - -#DEF_TABNAME = def -#DEF_BISON_SRCS = def.y -# -#FAKE_ALL: all -# -#LIBTARGET = libdef.a -# -#HEADERS = \ -# def.tab.h \ -# lex.h \ -# lex.cpph -# -#PUBLIC_HDRS = \ -# defiAlias.hpp \ -# defiAssertion.hpp \ -# defiBlockage.hpp \ -# defiComponent.hpp \ -# defiDebug.hpp \ -# defiDefs.hpp \ -# defiFPC.hpp \ -# defiFill.hpp \ -# defiGroup.hpp \ -# defiIOTiming.hpp \ -# defiKRDefs.hpp \ -# defiMisc.hpp \ -# defiNet.hpp \ -# defiNonDefault.hpp \ -# defiPartition.hpp \ -# defiPath.hpp \ -# defiPinCap.hpp \ -# defiPinProp.hpp \ -# defiProp.hpp \ -# defiPropType.hpp \ -# defiRegion.hpp \ -# defiRowTrack.hpp \ -# defiScanchain.hpp \ -# defiSite.hpp \ -# defiSlot.hpp \ -# defiTimingDisable.hpp \ -# defiUser.hpp \ -# defiUtil.hpp \ -# defiVia.hpp \ -# defrCallBacks.hpp \ -# defrData.hpp \ -# defrReader.hpp \ -# defrSettings.hpp \ -# defwWriter.hpp \ -# defwWriterCalls.hpp -# -#LIBSRCS = \ -# def.tab.cpp \ -# def_keywords.cpp \ -# defiAlias.cpp \ -# defiAssertion.cpp \ -# defiBlockage.cpp \ -# defiComponent.cpp \ -# defiDebug.cpp \ -# defiFPC.cpp \ -# defiFill.cpp \ -# defiGroup.cpp \ -# defiIOTiming.cpp \ -# defiMisc.cpp \ -# defiNet.cpp \ -# defiNonDefault.cpp \ -# defiPartition.cpp \ -# defiPath.cpp \ -# defiPinCap.cpp \ -# defiPinProp.cpp \ -# defiProp.cpp \ -# defiPropType.cpp \ -# defiRegion.cpp \ -# defiRowTrack.cpp \ -# defiScanchain.cpp \ -# defiSite.cpp \ -# defiSlot.cpp \ -# defiTimingDisable.cpp \ -# defiUtil.cpp \ -# defiVia.cpp \ -# defrCallbacks.cpp \ -# defrData.cpp \ -# defrReader.cpp \ -# defrSettings.cpp \ -# defwWriter.cpp \ -# defwWriterCalls.cpp -# -#def.tab.cpp : $(DEF_BISON_SRCS) -# bison -v -p$(DEF_TABNAME)yy -d $(DEF_BISON_SRCS) -# mv $(DEF_TABNAME).tab.c $(DEF_TABNAME).tab.cpp ; -# -#include ../template.mk + install ( FILES ${includes} DESTINATION include/lefdef ) diff --git a/lefdef/src/def/defzlib/CMakeLists.txt b/lefdef/src/def/defzlib/CMakeLists.txt index ef501c67..16904e7b 100644 --- a/lefdef/src/def/defzlib/CMakeLists.txt +++ b/lefdef/src/def/defzlib/CMakeLists.txt @@ -14,4 +14,4 @@ set_target_properties ( defzlib PROPERTIES VERSION 5.8 SOVERSION 5 ) install ( TARGETS defzlib DESTINATION lib${LIB_SUFFIX} ) - install ( FILES ${includes} DESTINATION include/def ) + install ( FILES ${includes} DESTINATION include/lefdef ) diff --git a/lefdef/src/lef/lef/CMakeLists.txt b/lefdef/src/lef/lef/CMakeLists.txt index e530b53a..8b40182d 100644 --- a/lefdef/src/lef/lef/CMakeLists.txt +++ b/lefdef/src/lef/lef/CMakeLists.txt @@ -69,48 +69,4 @@ set_target_properties ( lef PROPERTIES VERSION 5.8 SOVERSION 5 ) install ( TARGETS lef DESTINATION lib${LIB_SUFFIX} ) - install ( FILES ${includes} DESTINATION include/lef ) - - -#LEF_TABNAME = lef -#LEF_BISON_SRCS = lef.y -# -#FAKE_ALL: all -# -#DIRNAME = lef -#LEF_BISON_SRCS = lef.y -# -#LIBTARGET = liblef.a -# -#HEADERS = \ -# lef.tab.h \ -# lex.h \ -# crypt.hpp \ -# lex.cpph -# -#LIBSRCS = \ -# crypt.cpp \ -# lef.tab.cpp \ -# lef_keywords.cpp \ -# lefiArray.cpp \ -# lefiCrossTalk.cpp \ -# lefiDebug.cpp \ -# lefiEncryptInt.cpp \ -# lefiLayer.cpp \ -# lefiMacro.cpp \ -# lefiMisc.cpp \ -# lefiNonDefault.cpp \ -# lefiProp.cpp \ -# lefiPropType.cpp \ -# lefiTBExt.cpp \ -# lefiUnits.cpp \ -# lefiVia.cpp \ -# lefiViaRule.cpp \ -# lefrCallbacks.cpp \ -# lefrData.cpp \ -# lefrReader.cpp \ -# lefrSettings.cpp \ -# lefwWriter.cpp \ -# lefwWriterCalls.cpp -# -#include ../template.mk + install ( FILES ${includes} DESTINATION include/lefdef ) diff --git a/lefdef/src/lef/lefzlib/CMakeLists.txt b/lefdef/src/lef/lefzlib/CMakeLists.txt index 7d9cc991..9615d6bf 100644 --- a/lefdef/src/lef/lefzlib/CMakeLists.txt +++ b/lefdef/src/lef/lefzlib/CMakeLists.txt @@ -14,4 +14,4 @@ set_target_properties ( lefzlib PROPERTIES VERSION 5.8 SOVERSION 5 ) install ( TARGETS lefzlib DESTINATION lib${LIB_SUFFIX} ) - install ( FILES ${includes} DESTINATION include/lef ) + install ( FILES ${includes} DESTINATION include/lefdef )