Skip to content
Snippets Groups Projects
Commit e6fa358b authored by Rye Mutt's avatar Rye Mutt :bread:
Browse files

Fix linux CI build

parent 2d6ac41a
No related branches found
No related tags found
No related merge requests found
...@@ -25,7 +25,7 @@ else (USESYSTEMLIBS) ...@@ -25,7 +25,7 @@ else (USESYSTEMLIBS)
debug ${ARCH_PREBUILT_DIRS_DEBUG}/${APR_selector}aprutil-1.lib ${APRICONV_LIBRARIES} debug ${ARCH_PREBUILT_DIRS_DEBUG}/${APR_selector}aprutil-1.lib ${APRICONV_LIBRARIES}
optimized ${ARCH_PREBUILT_DIRS_RELEASE}/${APR_selector}aprutil-1.lib ${APRICONV_LIBRARIES} optimized ${ARCH_PREBUILT_DIRS_RELEASE}/${APR_selector}aprutil-1.lib ${APRICONV_LIBRARIES}
) )
else() elseif(DARWIN)
set(APR_LIBRARIES set(APR_LIBRARIES
debug ${ARCH_PREBUILT_DIRS_DEBUG}/libapr-1.a debug ${ARCH_PREBUILT_DIRS_DEBUG}/libapr-1.a
optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libapr-1.a optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libapr-1.a
...@@ -35,6 +35,15 @@ else (USESYSTEMLIBS) ...@@ -35,6 +35,15 @@ else (USESYSTEMLIBS)
debug ${ARCH_PREBUILT_DIRS_DEBUG}/libaprutil-1.a ${APRICONV_LIBRARIES} debug ${ARCH_PREBUILT_DIRS_DEBUG}/libaprutil-1.a ${APRICONV_LIBRARIES}
optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libaprutil-1.a ${APRICONV_LIBRARIES} optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libaprutil-1.a ${APRICONV_LIBRARIES}
) )
else()
set(APR_LIBRARIES
debug ${ARCH_PREBUILT_DIRS_DEBUG}/libapr-1.a
optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libapr-1.a
)
set(APRUTIL_LIBRARIES
debug ${ARCH_PREBUILT_DIRS_DEBUG}/libaprutil-1.a
optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libaprutil-1.a
)
endif () endif ()
set(APR_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include/apr-1) set(APR_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include/apr-1)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment