more cmake

CMakeLists.txt

@@ -551,12 +551,6 @@ find_package(TCL)
 
 # Zlib
 include(FindZLIB)
-# Translate cmake bool to StaConfig.h ifdef bool
-if (ZLIB_FOUND)
-  set(ZLIB 1)
-else()
-  set(ZLIB 0)
-endif()
 
 ################################################################
 #
@@ -675,10 +669,13 @@ target_link_libraries(sta
   OpenSTA
   sta_swig
   ${TCL_LIBRARY}
-  ZLIB
-  CUDD_LIB
+  ${ZLIB_LIBRARIES}
   )
 
+if (CUDD_LIB)
+target_link_libraries(sta ${CUDD_LIB})
+endif()
+
 message(STATUS "STA executable: ${STA_HOME}/app/sta")
 
 # g++ std::thread apparently still needs -pthreads.

util/StaConfig.hh.cmake

@@ -2,7 +2,7 @@
 
 #define STA_GIT_SHA1 "${STA_GIT_SHA1}"
 
-#define ZLIB ${ZLIB}
+#cmakedefine ZLIB_FOUND
 
 #define CUDD ${CUDD}
 

util/Zlib.hh

@@ -21,11 +21,11 @@
 
 #include "StaConfig.hh"  // ZLIB
 
-#if ZLIB
+#ifdef ZLIB_FOUND
 
 #include <zlib.h>
 
-#else // ZLIB
+#else // ZLIB_FOUND
 
 #include <stdio.h>
 
@@ -36,4 +36,4 @@
 #define gzprintf fprintf
 #define Z_NULL nullptr
 
-#endif // ZLIB
+#endif // ZLIB_FOUND