Browse Source

remove explicit .lib extension #3

now all .lib extensions removed (and managed implicitly by cmake)
Aleksey N. Vinogradov 9 months ago
parent
commit
0efb732cc8
2 changed files with 8 additions and 4 deletions
  1. 1 1
      api/libsphinxclient/CMakeLists.txt
  2. 7 3
      src/CMakeLists.txt

+ 1 - 1
api/libsphinxclient/CMakeLists.txt

@@ -24,7 +24,7 @@ if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND CMAKE_CXX_COMPILER_FRONTEND_VARIA
 else ()
 	target_compile_options ( sphinxclient PRIVATE -g3 -Wall -O0 )
 endif ()
-target_link_libraries ( sphinxclient PRIVATE $<$<PLATFORM_ID:Windows>:wsock32.lib> )
+target_link_libraries ( sphinxclient PRIVATE $<$<PLATFORM_ID:Windows>:wsock32> )
 
 if (NOT BUILD_TESTING OR DISABLE_GTESTS OR WIN32 OR TEST_SPECIAL_EXTERNAL )
 	return()

+ 7 - 3
src/CMakeLists.txt

@@ -69,7 +69,9 @@ add_library ( lmanticore STATIC sphinx.cpp sphinxquery.cpp sphinxutils.cpp
 		aggrexpr.cpp joinsorter.cpp queuecreator.cpp exprgeodist.cpp exprremap.cpp exprdocstore.cpp schematransform.cpp
 		sortergroup.cpp sortertraits.cpp sorterprecalc.cpp querycontext.cpp skip_cache.cpp jsonsi.cpp sorterscroll.cpp )
 
-target_link_libraries ( lmanticore PRIVATE $<$<PLATFORM_ID:Windows>:dbghelp AdvAPI32 ShLwApi> )
+if (WIN32)
+target_link_libraries ( lmanticore PRIVATE dbghelp AdvAPI32 ShLwApi )
+endif()
 
 add_library ( lstem STATIC sphinxsoundex.cpp sphinxmetaphone.cpp sphinxstemen.cpp sphinxstemru.cpp sphinxstemru.inl
 		sphinxstemcz.cpp sphinxstemar.cpp )
@@ -266,7 +268,9 @@ add_library ( digest_sha1 digest_sha1.cpp )
 target_link_libraries ( digest_sha1 PRIVATE lextra )
 target_link_libraries ( lsearchd PUBLIC digest_sha1 lextra nlohmann_json::nlohmann_json )
 target_link_libraries ( lsearchd INTERFACE Boost::filesystem )
-target_link_libraries ( lsearchd PRIVATE $<$<PLATFORM_ID:Windows>:iphlpapi WS2_32 wsock32> )
+if (WIN32)
+target_link_libraries ( lsearchd PRIVATE iphlpapi WS2_32 wsock32 )
+endif()
 
 function (stackmock processors compiler versions config values)
 	if (NOT CMAKE_SYSTEM_PROCESSOR IN_LIST processors)
@@ -444,7 +448,7 @@ if (WITH_MYSQL)
 	source_group ( "Testing config" FILES testrt.conf.in )
 	add_executable ( testrt testrt.cpp ${MANTICORE_BINARY_DIR}/config/rtestconfig.h )
 	target_compile_definitions ( testrt PRIVATE "DATAFLD=\"${DATAFLD}/\"" )
-	target_link_libraries ( testrt PRIVATE source_mysql PUBLIC lmanticore $<$<PLATFORM_ID:Windows>:psapi.lib> )
+	target_link_libraries ( testrt PRIVATE source_mysql PUBLIC lmanticore $<$<PLATFORM_ID:Windows>:psapi> )
 	if (HAVE_RTESTCONFIG_H)
 		target_compile_definitions ( testrt PRIVATE "-DHAVE_RTESTCONFIG_H" )
 	endif ()