diff --git a/ispd/CMakeLists.txt b/ispd/CMakeLists.txt index a7b034b0..12fecf67 100644 --- a/ispd/CMakeLists.txt +++ b/ispd/CMakeLists.txt @@ -20,10 +20,14 @@ ENDIF(APPLE) SET(CMAKE_C_FLAGS_DEBUG "-g -Wall" CACHE STRING "Debug options." FORCE) SET(CMAKE_CXX_FLAGS_DEBUG "-g -Wall" CACHE STRING "Debug options." FORCE) -#SET(CMAKE_LINKER_FLAGS_DEBUG "-pg" CACHE STRING "Debug options." FORCE) -#SET(CMAKE_SHARED_LINKER_FLAGS_DEBUG "-pg" CACHE STRING "Debug options." FORCE) -#SET(CMAKE_MODULE_LINKER_FLAGS_DEBUG "-pg" CACHE STRING "Debug options." FORCE) -#SET(CMAKE_EXE_LINKER_FLAGS_DEBUG "-pg" CACHE STRING "Debug options." FORCE) +#SET(CMAKE_LINKER_FLAGS_DEBUG "-pg" CACHE STRING "Debug options." FORCE) +#SET(CMAKE_SHARED_LINKER_FLAGS_DEBUG "-pg" CACHE STRING "Debug options." FORCE) +#SET(CMAKE_MODULE_LINKER_FLAGS_DEBUG "-pg" CACHE STRING "Debug options." FORCE) +#SET(CMAKE_EXE_LINKER_FLAGS_DEBUG "-pg" CACHE STRING "Debug options." FORCE) + +IF(COMMAND CMAKE_POLICY) + CMAKE_POLICY(SET CMP0003 NEW) +ENDIF(COMMAND CMAKE_POLICY) # This macro has to be included in all the tools CMakeLists.txt as it's # the sole means of localizing other tools/projects. @@ -36,7 +40,7 @@ MACRO(SETUP_PROJECT_PATHS project) IF( NOT("$ENV{${project}_USER_TOP}" STREQUAL "") ) MESSAGE("-- ${project}_USER_TOP is set to $ENV{${project}_USER_TOP}") - SET(PROJECT_MODULE_PATH "$ENV{${project}_USER_TOP}/share/cmake_modules/") + SET(PROJECT_MODULE_PATH "$ENV{${project}_USER_TOP}/share/cmake_modules/") LIST(INSERT CMAKE_MODULE_PATH 0 "${PROJECT_MODULE_PATH}") ENDIF( NOT("$ENV{${project}_USER_TOP}" STREQUAL "") ) @@ -46,21 +50,19 @@ ENDMACRO(SETUP_PROJECT_PATHS project) SETUP_PROJECT_PATHS(IO) SETUP_PROJECT_PATHS(CORIOLIS) -MESSAGE("-- Components of CMAKE_MODULE_PATH:") -FOREACH(PATH IN LISTS CMAKE_MODULE_PATH) - MESSAGE("-- ${PATH}") -ENDFOREACH(PATH) - SET(QT_USE_QTXML "true") FIND_PACKAGE(Boost 1.33.1 COMPONENTS program_options REQUIRED) FIND_PACKAGE(Qt4 REQUIRED) # find and setup Qt4 for this project +FIND_PACKAGE(LEFDEF REQUIRED) FIND_PACKAGE(IO REQUIRED) FIND_PACKAGE(HURRICANE REQUIRED) -FIND_PACKAGE(LEFDEF REQUIRED) FIND_PACKAGE(CORIOLIS REQUIRED) FIND_PACKAGE(KNIK REQUIRED) -FIND_PACKAGE(KATABATIC REQUIRED) +#FIND_PACKAGE(KATABATIC REQUIRED) +#FIND_PACKAGE(KITE REQUIRED) +#FIND_PACKAGE(EQUINOX REQUIRED) +#FIND_PACKAGE(SOLSTICE REQUIRED) SET_LIB_LINK_MODE() diff --git a/ispd/src/IspdMain.cpp b/ispd/src/IspdMain.cpp index 5418bed2..ac66f1f9 100644 --- a/ispd/src/IspdMain.cpp +++ b/ispd/src/IspdMain.cpp @@ -343,7 +343,7 @@ namespace { vcapacity += _vertiCap[i]; vcapacity = vcapacity / ( _minWidth[1]+_minSpacing[1] ); // XXX we consider only 2 layers!!! - _knik->createRoutingGrid ( _nbGCellsX, _nbGCellsY, _lowerLeftX, _lowerLeftY, _tileWidth, _tileHeight, hcapacity, vcapacity ); + _knik->createRoutingGrid ( _nbGCellsX, _nbGCellsY, _cell->getAbutmentBox(), _tileWidth, _tileHeight, hcapacity, vcapacity ); // for ispd07 reload _knik->createRoutingGraph(); }