Skip to content

Commit

Permalink
Remove unneeded installed libs
Browse files Browse the repository at this point in the history
  • Loading branch information
variar committed Apr 17, 2021
1 parent e9d3c1d commit 324a3c7
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 7 deletions.
1 change: 1 addition & 0 deletions 3rdparty/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ add_subdirectory(maddy)
add_subdirectory(whereami)

set(FAT_RUNTIME OFF CACHE INTERNAL "" FORCE)
set(HAVE_AVX2 FALSE)
add_subdirectory(hyperscan) #5.4.0
mark_as_advanced(FORCE FAT_RUNTIME)

Expand Down
12 changes: 6 additions & 6 deletions 3rdparty/hyperscan/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -504,9 +504,9 @@ if (NOT WIN32)
endif()
endforeach()

configure_file(libhs.pc.in libhs.pc @ONLY) # only replace @ quoted vars
install(FILES ${CMAKE_BINARY_DIR}/libhs.pc
DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
#configure_file(libhs.pc.in libhs.pc @ONLY) # only replace @ quoted vars
#install(FILES ${CMAKE_BINARY_DIR}/libhs.pc
# DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
endif()

# only set these after all tests are done
Expand Down Expand Up @@ -567,7 +567,7 @@ SET(hs_HEADERS
src/hs_compile.h
src/hs_runtime.h
)
install(FILES ${hs_HEADERS} DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/hs")
#install(FILES ${hs_HEADERS} DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/hs")

set (hs_exec_common_SRCS
src/alloc.c
Expand Down Expand Up @@ -1329,7 +1329,7 @@ else (FAT_RUNTIME)
endif (NOT FAT_RUNTIME)

if (NOT BUILD_SHARED_LIBS)
install(TARGETS hs_runtime DESTINATION ${CMAKE_INSTALL_LIBDIR})
#install(TARGETS hs_runtime DESTINATION ${CMAKE_INSTALL_LIBDIR})
endif()

if (BUILD_STATIC_AND_SHARED OR BUILD_SHARED_LIBS)
Expand Down Expand Up @@ -1361,7 +1361,7 @@ if (BUILD_STATIC_LIBS)
endif ()

if (NOT BUILD_SHARED_LIBS)
install(TARGETS hs DESTINATION ${CMAKE_INSTALL_LIBDIR})
#install(TARGETS hs DESTINATION ${CMAKE_INSTALL_LIBDIR})
endif()

if (BUILD_STATIC_AND_SHARED OR BUILD_SHARED_LIBS)
Expand Down
2 changes: 1 addition & 1 deletion 3rdparty/onetbb/src/tbb/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ target_link_libraries(klogg_tbb
${TBB_COMMON_LINK_LIBS}
)

tbb_install_target(klogg_tbb)
#tbb_install_target(klogg_tbb)

if (WIN32)
# Create a copy of target linker file (tbb<ver>[_debug].lib) with legacy name (tbb[_debug].lib)
Expand Down

0 comments on commit 324a3c7

Please sign in to comment.