Merge pull request The-OpenROAD-Project#18 from The-OpenROAD-Project/…

…revert-17-cmake_boost

Revert "Cmake boost"

CMakeLists.txt

@@ -13,6 +13,11 @@ if (CMAKE_COMPILER_IS_GNUCC AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 7)
   message(FATAL_ERROR "TritonRoute requires GCC 7 and above! \nuse -DCMAKE_CXX_COMPILER to assign your compiler path")
 endif()
 
+
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3")
+set(CMAKE_CXX_FLAGS_DEBUG "-O0 -ggdb")
+set(CMAKE_CXX_FLAGS_RELEASE "-O3")
+
 set(THREADS_PREFER_PTHREAD_FLAG ON)
 
 set(FLEXROUTE_HOME ${PROJECT_SOURCE_DIR} )
@@ -33,7 +38,7 @@ add_subdirectory(${LEFLIB_HOME})
 find_package(ZLIB REQUIRED)
 find_package(BISON REQUIRED)
 
-find_package(Boost 1.67.0 REQUIRED)
+find_package(Boost 1.68.0 REQUIRED)
 find_package(Threads REQUIRED)
 
 set (FLEXROUTE_SRC
@@ -154,17 +159,26 @@ set (FLEXROUTE_HEADER
 # include directories 
 ############################################################
 include_directories(
-  ${Boost_INCLUDE_DIR}
+  ${BOOST_INCLUDEDIR}
+  ${BOOST_ROOT}/include
+
   ${DEFLIB_HOME}/def
+  ${DEFLIB_HOME}/defzlib
+  ${DEFLIB_HOME}/cdef
+  ${DEFLIB_HOME}/cdefzlib
+
   ${LEFLIB_HOME}/lef
+  ${LEFLIB_HOME}/lefzlib
+  ${LEFLIB_HOME}/clef
+  ${LEFLIB_HOME}/clefzlib
 
   ${FLEXROUTE_HOME}/src
 )
 
 ############################################################
 # Create a library 
 ############################################################
-add_library( flexroutelib
+add_library( flexroutelib STATIC
   ${FLEXROUTE_SRC}
 )
 
@@ -188,10 +202,17 @@ add_dependencies( flexroutelib lef )
 target_link_libraries( TritonRoute 
   PUBLIC
   def
+  #defzlib
+  #cdef
+  #cdefzlib
   lef
+  #lefzlib
+  #clef
+  #clefzlib
 
   ${ZLIB_LIBRARIES}
   Threads::Threads
+  -static 
   )
 
 ############################################################

Dockerfile

@@ -25,9 +25,9 @@ RUN wget https://cmake.org/files/v3.14/cmake-3.14.0-Linux-x86_64.sh && \
     ./cmake-3.14.0-Linux-x86_64.sh --skip-license --prefix=/usr/local
 
 # installing boost for build dependency
-RUN wget https://sourceforge.net/projects/boost/files/boost/1.72.0/boost_1_72_0.tar.bz2/download && \
-    tar -xf download && \
-    cd boost_1_72_0 && \
+RUN wget https://dl.bintray.com/boostorg/release/1.68.0/source/boost_1_68_0.tar.bz2 && \
+    tar -xf boost_1_68_0.tar.bz2 && \
+    cd boost_1_68_0 && \
     ./bootstrap.sh && \
     ./b2 install
 

module/def/5.8-p029/CMakeLists.txt

@@ -7,6 +7,9 @@ cmake_minimum_required(VERSION 3.1)
 
 set(DEFLIB_HOME ${CMAKE_CURRENT_SOURCE_DIR})
 
+set(CMAKE_CXX_FLAGS_DEBUG "-g -ggdb")
+set(CMAKE_CXX_FLAGS_RELEASE "-O3")
+
 # BISON and ZLIB is required to compile DEF/LEF Parsers.
 find_package(BISON)
 find_package(ZLIB)
@@ -55,6 +58,40 @@ set( DEFLIB_DEFZLIB_SRC
   defzlib/defzlib.cpp
   )
 
+set ( DEFLIB_CDEF_SRC 
+  cdef/xdefiAssertion.cpp
+  cdef/xdefiBlockage.cpp
+  cdef/xdefiComponent.cpp
+  cdef/xdefiDebug.cpp
+  cdef/xdefiFill.cpp
+  cdef/xdefiFPC.cpp
+  cdef/xdefiGroup.cpp
+  cdef/xdefiIOTiming.cpp
+  cdef/xdefiMisc.cpp
+  cdef/xdefiNet.cpp
+  cdef/xdefiNonDefault.cpp
+  cdef/xdefiPartition.cpp
+  cdef/xdefiPath.cpp
+  cdef/xdefiPinCap.cpp
+  cdef/xdefiPinProp.cpp
+  cdef/xdefiProp.cpp
+  cdef/xdefiPropType.cpp
+  cdef/xdefiRegion.cpp
+  cdef/xdefiRowTrack.cpp
+  cdef/xdefiScanchain.cpp
+  cdef/xdefiSite.cpp
+  cdef/xdefiSlot.cpp
+  cdef/xdefiTimingDisable.cpp
+  cdef/xdefiVia.cpp
+  cdef/xdefrReader.cpp
+  cdef/xdefwWriterCalls.cpp
+  cdef/xdefwWriter.cpp
+  )
+
+set (DEFLIB_CDEFZLIB_SRC
+  cdefzlib/cdefzlib.c
+  )
+
 set (DEFLIB_HEADERS
   def/def.tab.h
   def/lex.h
@@ -95,6 +132,42 @@ set (DEFLIB_HEADERS
   def/defwWriter.hpp
 
   defzlib/defzlib.hpp
+
+  cdef/defiAlias.h
+  cdef/defiAssertion.h
+  cdef/defiBlockage.h
+  cdef/defiComponent.h
+  cdef/defiDebug.h
+  cdef/defiDefs.h
+  cdef/defiFill.h
+  cdef/defiFPC.h
+  cdef/defiGroup.h
+  cdef/defiIOTiming.h
+  cdef/defiKRDefs.h
+  cdef/defiMisc.h
+  cdef/defiNet.h
+  cdef/defiNonDefault.h
+  cdef/defiPartition.h
+  cdef/defiPath.h
+  cdef/defiPinCap.h
+  cdef/defiPinProp.h
+  cdef/defiProp.h
+  cdef/defiPropType.h
+  cdef/defiRegion.h
+  cdef/defiRowTrack.h
+  cdef/defiScanchain.h
+  cdef/defiSite.h
+  cdef/defiSlot.h
+  cdef/defiTimingDisable.h
+  cdef/defiTypedefs.h
+  cdef/defiUser.h
+  cdef/defiVia.h
+  cdef/defMsgTable.h
+  cdef/defrReader.h
+  cdef/defwWriterCalls.h
+  cdef/defwWriter.h
+
+  cdefzlib/defzlib.h
 )
 
 
@@ -108,44 +181,76 @@ add_custom_command(
 add_custom_target(DefBisonTarget ALL DEPENDS def/def.tab.cpp)
 
 
-add_library( def ${DEFLIB_DEF_SRC} )
-add_library( defzlib ${DEFLIB_DEFZLIB_SRC} )
+add_library( def STATIC ${DEFLIB_DEF_SRC} )
+add_library( defzlib STATIC ${DEFLIB_DEFZLIB_SRC} )
+
+add_library( cdef STATIC ${DEFLIB_CDEF_SRC} )
+add_library( cdefzlib STATIC ${DEFLIB_CDEFZLIB_SRC})
+
 
 set_target_properties( def
   PROPERTIES
   ARCHIVE_OUTPUT_DIRECTORY ${DEFLIB_HOME}/lib
   LIBRARY_OUTPUT_DIRECTORY ${DEFLIB_HOME}/lib
   RUNTIME_OUTPUT_DIRECTORY ${DEFLIB_HOME}/lib
-  # python regression requirement (gag me) -cherry
-  POSITION_INDEPENDENT_CODE ON
 )
 
 set_target_properties( defzlib
   PROPERTIES
   ARCHIVE_OUTPUT_DIRECTORY ${DEFLIB_HOME}/lib
   LIBRARY_OUTPUT_DIRECTORY ${DEFLIB_HOME}/lib
   RUNTIME_OUTPUT_DIRECTORY ${DEFLIB_HOME}/lib
-  # python regression requirement (gag me) -cherry
-  POSITION_INDEPENDENT_CODE ON
+)
+
+set_target_properties( cdef
+  PROPERTIES
+  ARCHIVE_OUTPUT_DIRECTORY ${DEFLIB_HOME}/lib
+  LIBRARY_OUTPUT_DIRECTORY ${DEFLIB_HOME}/lib
+  RUNTIME_OUTPUT_DIRECTORY ${DEFLIB_HOME}/lib
+)
+
+set_target_properties( cdefzlib 
+  PROPERTIES 
+  ARCHIVE_OUTPUT_DIRECTORY ${DEFLIB_HOME}/lib
+  LIBRARY_OUTPUT_DIRECTORY ${DEFLIB_HOME}/lib
+  RUNTIME_OUTPUT_DIRECTORY ${DEFLIB_HOME}/lib
+  LINKER_LANGUAGE CXX 
 )
 
 # include directory settings
 target_include_directories( def
   PUBLIC
-  def
+  def/
   )
 
 target_include_directories( defzlib
   PUBLIC
-  def
-  defzlib
+  def/
+  defzlib/
   )
 
+target_include_directories( cdef 
+  PUBLIC
+  def/
+  cdef/
+  )
+
+target_include_directories( cdefzlib
+  PUBLIC
+  def/
+  defzlib/
+  cdef/
+  cdefzlib/
+  )
+
+add_dependencies( cdef def )
 add_dependencies( def DefBisonTarget )
 add_dependencies( defzlib def )
+add_dependencies( cdefzlib cdef )
 
 ######################################################
 # install
 
 install(FILES ${DEFLIB_HEADERS} DESTINATION include)
-install(TARGETS def defzlib DESTINATION lib)
+install(TARGETS def defzlib cdef cdefzlib DESTINATION lib)
+