fix export test failures

ygj6 · Jul 2, 2020 · 410552a · 410552a
1 parent 2cfa7ff
commit 410552a
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/cmake/AddEventLibrary.cmake b/cmake/AddEventLibrary.cmake
@@ -158,7 +158,8 @@ macro(add_event_library LIB_NAME)
                 "${LIB_NAME}_shared" PROPERTIES
                 OUTPUT_NAME "${LIB_NAME}-${EVENT_PACKAGE_RELEASE}"
                 VERSION "${CURRENT_MINUS_AGE}.${EVENT_ABI_LIBVERSION_AGE}.${EVENT_ABI_LIBVERSION_REVISION}"
-                SOVERSION "${CURRENT_MINUS_AGE}")
+                SOVERSION "${CURRENT_MINUS_AGE}"
+                INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
         endif()
 
         if (NOT WIN32)

diff --git a/test-export/CMakeLists.txt b/test-export/CMakeLists.txt
@@ -7,7 +7,7 @@ project(verify)
 if(NOT ${EVENT__CODE_COMPONENT} STREQUAL "")
     string(TOUPPER ${EVENT__CODE_COMPONENT} _UPPER_COMPONENT)
 endif()
-find_package(Libevent 2.2.0 REQUIRED COMPONENTS ${EVENT__LINK_COMPONENT})
+find_package(Libevent 2.1.0 REQUIRED COMPONENTS ${EVENT__LINK_COMPONENT})
 add_definitions(-DEVENT_EXPORT_TEST_COMPONENT_${_UPPER_COMPONENT})
 add_executable(test-export test-export.c)
 target_link_libraries(test-export ${LIBEVENT_LIBRARIES})

diff --git a/test-export/test-export.py b/test-export/test-export.py
@@ -48,11 +48,11 @@ def link_and_run(link, code):
         Returns 0 if links and runs successfully, otherwise 1.
     """
     exec_cmd("cmake --build . --target clean", True)
-    generator = ''
+    arch = ''
     if platform.system() == "Windows":
-        generator = '-G "Visual Studio 15 2017 Win64"'
+        arch = '-A x64'
     cmd = 'cmake .. %s -DEVENT__LINK_COMPONENT=%s -DEVENT__CODE_COMPONENT=%s' % (
-        generator, link, code)
+        arch, link, code)
     if link_type == "static":
         cmd = "".join([cmd, " -DLIBEVENT_STATIC_LINK=1"])
     r = exec_cmd(cmd, True)