some build changes

COMBINE-lab · Sep 6, 2019 · f1ead77 · f1ead77
1 parent 138e8f4
commit f1ead77
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -317,6 +317,9 @@ else()
 endif()
 
 find_package(Iconv REQUIRED)
+if(NOT Iconv_IS_BUILT_IN)
+  set(ICONV_LIB Iconv::Iconv)
+endif()
 
 find_package(LibLZMA)
 if(NOT LIBLZMA_FOUND)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -251,7 +251,6 @@ target_link_libraries(salmon
     ${LIBRT}
     ksw2pp
 ## PUFF_INTEGRATION    
-    Iconv::Iconv
     alevin_core
     ${CMAKE_DL_LIBS}
     #asan
@@ -265,23 +264,28 @@ target_link_libraries(unitTests
     alevin_core
     salmon_core
     gff
+    ${STADEN_LIBRARIES} 
     ${Boost_LIBRARIES}
     ${ICU_LIBS}
-    ${STADEN_LIBRARIES} ${CURL_LIBRARIES}
+    ${CURL_LIBRARIES}
     ${ZLIB_LIBRARY}
     m
     ${LIBLZMA_LIBRARIES}
     ${BZIP2_LIBRARIES}
     ${TBB_LIBRARIES}
     ${LIBSALMON_LINKER_FLAGS}
     ${NON_APPLECLANG_LIBS}
-    Iconv::Iconv
     ${LIBRT}
     ${CMAKE_DL_LIBS}
     #asan
     #ubsan
 )
 
+if(NOT Iconv_IS_BUILT_IN)
+  target_link_libraries(unitTests Iconv::Iconv)
+  target_link_libraries(salmon Iconv::Iconv)
+endif()
+
 add_dependencies(salmon unitTests)
 
 ##