remove duplicate builds in CMakeList.txt

SVF-tools · May 2, 2020 · 48872ee · 48872ee
1 parent aae16a1
commit 48872ee
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 15 deletions.
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
@@ -79,18 +79,16 @@ set(SOURCES
     )
 
 add_llvm_library(Svf ${SOURCES})
-add_llvm_library(LLVMSvf ${SOURCES})
 
 link_directories( ${CMAKE_BINARY_DIR}/lib/Cudd )
 llvm_map_components_to_libnames(llvm_libs bitwriter core ipo irreader instcombine instrumentation target linker analysis scalaropts support )
-target_link_libraries(LLVMSvf )
-if ( CMAKE_SYSTEM_NAME MATCHES "Darwin")
-    target_link_libraries(Svf LLVMCudd )
-else()
-    target_link_libraries(Svf )
-endif()
+target_link_libraries(Svf Cudd)
+#if ( CMAKE_SYSTEM_NAME MATCHES "Darwin")
+#    target_link_libraries(Svf Cudd )
+#else()
+#    target_link_libraries(Svf )
+#endif()
 
 if(DEFINED IN_SOURCE_BUILD)
     add_dependencies(Svf intrinsics_gen)
-    add_dependencies(LLVMSvf intrinsics_gen)
 endif()
diff --git a/lib/CUDD/CMakeLists.txt b/lib/CUDD/CMakeLists.txt
@@ -38,12 +38,9 @@ set(SOURCES
 )
 
 add_llvm_library(Cudd ${SOURCES})
-add_llvm_library(LLVMCudd ${SOURCES})
 
 set_target_properties(Cudd PROPERTIES COMPILE_FLAGS "-Wno-format -Wno-int-to-pointer-cast -Wno-pointer-to-int-cast -O3 -w -DHAVE_IEEE_754 -DSIZEOF_VOID_P=8 -DSIZEOF_LONG=8")
-set_target_properties(LLVMCudd PROPERTIES COMPILE_FLAGS "-Wno-format -Wno-int-to-pointer-cast -Wno-pointer-to-int-cast -O3 -w -DHAVE_IEEE_754 -DSIZEOF_VOID_P=8 -DSIZEOF_LONG=8")
 
 if(DEFINED IN_SOURCE_BUILD)
     add_dependencies(Cudd intrinsics_gen)
-    add_dependencies(LLVMCudd intrinsics_gen)
 endif()
diff --git a/tools/DDA/CMakeLists.txt b/tools/DDA/CMakeLists.txt
@@ -6,7 +6,7 @@ else()
     llvm_map_components_to_libnames(llvm_libs BitWriter Core IPO IrReader InstCombine Instrumentation Target Linker Analysis ScalarOpts Support TransformUtils)
     add_executable( dvf dda.cpp )
 
-    target_link_libraries( dvf LLVMSvf LLVMCudd ${llvm_libs} )
+    target_link_libraries( dvf Svf Cudd ${llvm_libs} )
 
     set_target_properties( dvf PROPERTIES
                            RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin )

diff --git a/tools/Example/CMakeLists.txt b/tools/Example/CMakeLists.txt
@@ -6,7 +6,7 @@ else()
     llvm_map_components_to_libnames(llvm_libs BitWriter Core IPO IrReader InstCombine Instrumentation Target Linker Analysis ScalarOpts Support TransformUtils)
     add_executable( svf-ex svf-ex.cpp )
 
-    target_link_libraries( svf-ex LLVMSvf LLVMCudd ${llvm_libs} )
+    target_link_libraries( svf-ex Svf Cudd ${llvm_libs} )
 
     set_target_properties( svf-ex PROPERTIES
                            RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin )

diff --git a/tools/SABER/CMakeLists.txt b/tools/SABER/CMakeLists.txt
@@ -6,7 +6,7 @@ else()
     llvm_map_components_to_libnames(llvm_libs BitWriter Core IPO IrReader InstCombine Instrumentation Target Linker Analysis ScalarOpts Support TransformUtils)
     add_executable( saber saber.cpp )
 
-    target_link_libraries( saber LLVMSvf LLVMCudd ${llvm_libs} )
+    target_link_libraries( saber Svf Cudd ${llvm_libs} )
 
     set_target_properties( saber PROPERTIES
                            RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin )

diff --git a/tools/WPA/CMakeLists.txt b/tools/WPA/CMakeLists.txt
@@ -6,7 +6,7 @@ else()
     llvm_map_components_to_libnames(llvm_libs bitwriter core ipo irreader instcombine instrumentation target linker analysis scalaropts support transformutils)
     add_executable( wpa wpa.cpp )
 
-    target_link_libraries( wpa LLVMSvf LLVMCudd ${llvm_libs} )
+    target_link_libraries( wpa Svf Cudd ${llvm_libs} )
 
     set_target_properties( wpa PROPERTIES
                            RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin )