Fixing merge conflict resolution
This commit is contained in:
@@ -11,11 +11,4 @@ add_library(mini SHARED
|
||||
|
||||
)
|
||||
|
||||
# find_library(HILOAD_LIB NAMES hiload PATHS ${CMAKE_BINARY_DIR})
|
||||
# if (${HILOAD_LIB} STREQUAL 'HILOAD_LIB-NOTFOUND')
|
||||
# message(FATAL_ERROR "Couldn't find hiload library")
|
||||
# endif()
|
||||
|
||||
# target_link_libraries(minimal mini ${HILOAD_LIB})
|
||||
|
||||
target_link_libraries(minimal mini hiload)
|
||||
|
||||
Reference in New Issue
Block a user