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

Specify full path to link libraries on windows to support multi-config cmake generators properly

parent 0d29dfa9
No related branches found
No related tags found
1 merge request!24Newgen
Showing
with 115 additions and 52 deletions
# -*- cmake -*- # -*- cmake -*-
include(Linking)
include(Prebuilt) include(Prebuilt)
if (USESYSTEMLIBS) if (USESYSTEMLIBS)
...@@ -15,14 +16,14 @@ else (USESYSTEMLIBS) ...@@ -15,14 +16,14 @@ else (USESYSTEMLIBS)
if (WINDOWS) if (WINDOWS)
set(OGG_LIBRARIES set(OGG_LIBRARIES
optimized libogg optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libogg.lib
debug libogg) debug ${ARCH_PREBUILT_DIRS_DEBUG}/libogg.lib)
set(VORBIS_LIBRARIES set(VORBIS_LIBRARIES
optimized libvorbis optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libvorbis.lib
debug libvorbis) debug ${ARCH_PREBUILT_DIRS_DEBUG}/libvorbis.lib)
set(VORBISFILE_LIBRARIES set(VORBISFILE_LIBRARIES
optimized libvorbisfile optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libvorbisfile.lib
debug libvorbisfile) debug ${ARCH_PREBUILT_DIRS_DEBUG}/libvorbisfile.lib)
else (WINDOWS) else (WINDOWS)
set(OGG_LIBRARIES ogg) set(OGG_LIBRARIES ogg)
set(VORBIS_LIBRARIES vorbis) set(VORBIS_LIBRARIES vorbis)
......
# -*- cmake -*- # -*- cmake -*-
include(Prebuilt) include(Prebuilt)
include(Linking)
set(Boost_FIND_QUIETLY ON) set(Boost_FIND_QUIETLY ON)
set(Boost_FIND_REQUIRED ON) set(Boost_FIND_REQUIRED ON)
...@@ -25,32 +26,32 @@ else (USESYSTEMLIBS) ...@@ -25,32 +26,32 @@ else (USESYSTEMLIBS)
if (WINDOWS) if (WINDOWS)
set(BOOST_CONTEXT_LIBRARY set(BOOST_CONTEXT_LIBRARY
optimized libboost_context-mt${addrsfx} optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libboost_context-mt${addrsfx}.lib
debug libboost_context-mt-gd${addrsfx}) debug ${ARCH_PREBUILT_DIRS_DEBUG}/libboost_context-mt-gd${addrsfx}.lib)
set(BOOST_FIBER_LIBRARY set(BOOST_FIBER_LIBRARY
optimized libboost_fiber-mt${addrsfx} optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libboost_fiber-mt${addrsfx}.lib
debug libboost_fiber-mt-gd${addrsfx}) debug ${ARCH_PREBUILT_DIRS_DEBUG}/libboost_fiber-mt-gd${addrsfx}.lib)
set(BOOST_FILESYSTEM_LIBRARY set(BOOST_FILESYSTEM_LIBRARY
optimized libboost_filesystem-mt${addrsfx} optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libboost_filesystem-mt${addrsfx}.lib
debug libboost_filesystem-mt-gd${addrsfx}) debug ${ARCH_PREBUILT_DIRS_DEBUG}/libboost_filesystem-mt-gd${addrsfx}.lib)
set(BOOST_PROGRAM_OPTIONS_LIBRARY set(BOOST_PROGRAM_OPTIONS_LIBRARY
optimized libboost_program_options-mt${addrsfx} optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libboost_program_options-mt${addrsfx}.lib
debug libboost_program_options-mt-gd${addrsfx}) debug ${ARCH_PREBUILT_DIRS_DEBUG}/libboost_program_options-mt-gd${addrsfx}.lib)
set(BOOST_REGEX_LIBRARY set(BOOST_REGEX_LIBRARY
optimized libboost_regex-mt${addrsfx} optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libboost_regex-mt${addrsfx}.lib
debug libboost_regex-mt-gd${addrsfx}) debug ${ARCH_PREBUILT_DIRS_DEBUG}/libboost_regex-mt-gd${addrsfx}.lib)
set(BOOST_SIGNALS_LIBRARY set(BOOST_SIGNALS_LIBRARY
optimized libboost_signals-mt${addrsfx} optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libboost_signals-mt${addrsfx}.lib
debug libboost_signals-mt-gd${addrsfx}) debug ${ARCH_PREBUILT_DIRS_DEBUG}/libboost_signals-mt-gd${addrsfx}.lib)
set(BOOST_STACKTRACE_LIBRARY set(BOOST_STACKTRACE_LIBRARY
optimized libboost_stacktrace_windbg-mt${addrsfx} optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libboost_stacktrace_windbg-mt${addrsfx}.lib
debug libboost_stacktrace_windbg-mt-gd${addrsfx}) debug ${ARCH_PREBUILT_DIRS_DEBUG}/libboost_stacktrace_windbg-mt-gd${addrsfx}.lib)
set(BOOST_SYSTEM_LIBRARY set(BOOST_SYSTEM_LIBRARY
optimized libboost_system-mt${addrsfx} optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libboost_system-mt${addrsfx}.lib
debug libboost_system-mt-gd${addrsfx}) debug ${ARCH_PREBUILT_DIRS_DEBUG}/libboost_system-mt-gd${addrsfx}.lib)
set(BOOST_THREAD_LIBRARY set(BOOST_THREAD_LIBRARY
optimized libboost_thread-mt${addrsfx} optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libboost_thread-mt${addrsfx}.lib
debug libboost_thread-mt-gd${addrsfx}) debug ${ARCH_PREBUILT_DIRS_DEBUG}/libboost_thread-mt-gd${addrsfx}.lib)
elseif (LINUX) elseif (LINUX)
set(BOOST_CONTEXT_LIBRARY set(BOOST_CONTEXT_LIBRARY
optimized boost_context-mt${addrsfx} optimized boost_context-mt${addrsfx}
......
...@@ -14,9 +14,9 @@ endif (USESYSTEMLIBS) ...@@ -14,9 +14,9 @@ endif (USESYSTEMLIBS)
if (WINDOWS) if (WINDOWS)
set(CEF_PLUGIN_LIBRARIES set(CEF_PLUGIN_LIBRARIES
libcef.lib ${ARCH_PREBUILT_DIRS_RELEASE}/libcef.lib
libcef_dll_wrapper.lib ${ARCH_PREBUILT_DIRS_RELEASE}/libcef_dll_wrapper.lib
dullahan.lib ${ARCH_PREBUILT_DIRS_RELEASE}/dullahan.lib
) )
elseif (DARWIN) elseif (DARWIN)
FIND_LIBRARY(APPKIT_LIBRARY AppKit) FIND_LIBRARY(APPKIT_LIBRARY AppKit)
......
# -*- cmake -*- # -*- cmake -*-
include(Prebuilt) include(Prebuilt)
include(Linking)
set(CURL_FIND_QUIETLY ON) set(CURL_FIND_QUIETLY ON)
set(CURL_FIND_REQUIRED ON) set(CURL_FIND_REQUIRED ON)
...@@ -10,8 +11,8 @@ else (USESYSTEMLIBS) ...@@ -10,8 +11,8 @@ else (USESYSTEMLIBS)
use_prebuilt_binary(curl) use_prebuilt_binary(curl)
if (WINDOWS) if (WINDOWS)
set(CURL_LIBRARIES set(CURL_LIBRARIES
debug libcurld.lib debug ${ARCH_PREBUILT_DIRS_DEBUG}/libcurld.lib
optimized libcurl.lib) optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libcurl.lib)
else (WINDOWS) else (WINDOWS)
set(CURL_LIBRARIES libcurl.a) set(CURL_LIBRARIES libcurl.a)
endif (WINDOWS) endif (WINDOWS)
......
...@@ -12,8 +12,8 @@ else (USESYSTEMLIBS) ...@@ -12,8 +12,8 @@ else (USESYSTEMLIBS)
use_prebuilt_binary(expat) use_prebuilt_binary(expat)
if (WINDOWS) if (WINDOWS)
set(EXPAT_LIBRARIES set(EXPAT_LIBRARIES
debug libexpatd.lib debug ${ARCH_PREBUILT_DIRS_DEBUG}/libexpatd.lib
optimized libexpat.lib) optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libexpat.lib)
set(EXPAT_COPY libexpat.dll) set(EXPAT_COPY libexpat.dll)
else () else ()
set(EXPAT_LIBRARIES expat) set(EXPAT_LIBRARIES expat)
......
# -*- cmake -*- # -*- cmake -*-
include(Linking)
include(Prebuilt) include(Prebuilt)
if (USESYSTEMLIBS) if (USESYSTEMLIBS)
...@@ -8,5 +9,11 @@ if (USESYSTEMLIBS) ...@@ -8,5 +9,11 @@ if (USESYSTEMLIBS)
else (USESYSTEMLIBS) else (USESYSTEMLIBS)
use_prebuilt_binary(libepoxy) use_prebuilt_binary(libepoxy)
set(EPOXY_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/) set(EPOXY_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/)
if (WINDOWS)
set(EPOXY_LIBRARIES
debug ${ARCH_PREBUILT_DIRS_DEBUG}/epoxy.lib
optimized ${ARCH_PREBUILT_DIRS_RELEASE}/epoxy.lib)
else ()
set(EPOXY_LIBRARIES epoxy) set(EPOXY_LIBRARIES epoxy)
endif()
endif (USESYSTEMLIBS) endif (USESYSTEMLIBS)
\ No newline at end of file
...@@ -13,5 +13,11 @@ else () ...@@ -13,5 +13,11 @@ else ()
else() else()
set(FREETYPE_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/) set(FREETYPE_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/)
endif() endif()
if (WINDOWS)
set(FREETYPE_LIBRARIES
debug ${ARCH_PREBUILT_DIRS_DEBUG}/freetyped.lib
optimized ${ARCH_PREBUILT_DIRS_RELEASE}/freetype.lib)
else()
set(FREETYPE_LIBRARIES freetype) set(FREETYPE_LIBRARIES freetype)
endif() endif()
endif ()
# -*- cmake -*- # -*- cmake -*-
include(Linking)
include(Prebuilt) include(Prebuilt)
if (NOT USESYSTEMLIBS) if (NOT USESYSTEMLIBS)
...@@ -6,4 +7,10 @@ if (NOT USESYSTEMLIBS) ...@@ -6,4 +7,10 @@ if (NOT USESYSTEMLIBS)
endif (NOT USESYSTEMLIBS) endif (NOT USESYSTEMLIBS)
set(GLOD_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include) set(GLOD_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include)
if (WINDOWS)
set(GLOD_LIBRARIES
debug ${ARCH_PREBUILT_DIRS_DEBUG}/glod.lib
optimized ${ARCH_PREBUILT_DIRS_RELEASE}/glod.lib)
else ()
set(GLOD_LIBRARIES GLOD) set(GLOD_LIBRARIES GLOD)
endif ()
# -*- cmake -*- # -*- cmake -*-
include(Linking)
include(Prebuilt) include(Prebuilt)
set(HUNSPELL_FIND_QUIETLY ON) set(HUNSPELL_FIND_QUIETLY ON)
...@@ -9,7 +10,10 @@ if (USESYSTEMLIBS) ...@@ -9,7 +10,10 @@ if (USESYSTEMLIBS)
else (USESYSTEMLIBS) else (USESYSTEMLIBS)
use_prebuilt_binary(libhunspell) use_prebuilt_binary(libhunspell)
if (WINDOWS) if (WINDOWS)
set(HUNSPELL_LIBRARY libhunspell) set(HUNSPELL_LIBRARY
debug ${ARCH_PREBUILT_DIRS_DEBUG}/libhunspell.lib
optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libhunspell.lib
)
elseif(DARWIN) elseif(DARWIN)
set(HUNSPELL_LIBRARY hunspell-1.7) set(HUNSPELL_LIBRARY hunspell-1.7)
elseif(LINUX) elseif(LINUX)
......
...@@ -14,7 +14,9 @@ else (USESYSTEMLIBS) ...@@ -14,7 +14,9 @@ else (USESYSTEMLIBS)
elseif (DARWIN) elseif (DARWIN)
set(JPEG_LIBRARIES jpeg) set(JPEG_LIBRARIES jpeg)
elseif (WINDOWS) elseif (WINDOWS)
set(JPEG_LIBRARIES jpeg) set(JPEG_LIBRARIES
debug ${ARCH_PREBUILT_DIRS_DEBUG}/jpeg.lib
optimized ${ARCH_PREBUILT_DIRS_RELEASE}/jpeg.lib)
endif (LINUX) endif (LINUX)
set(JPEG_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include) set(JPEG_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include)
endif (USESYSTEMLIBS) endif (USESYSTEMLIBS)
# -*- cmake -*- # -*- cmake -*-
include(Linking)
include(Prebuilt) include(Prebuilt)
# There are three possible solutions to provide the llphysicsextensions: # There are three possible solutions to provide the llphysicsextensions:
...@@ -28,7 +29,17 @@ elseif (HAVOK_TPV) ...@@ -28,7 +29,17 @@ elseif (HAVOK_TPV)
else (HAVOK) else (HAVOK)
if (NOT USE_LL_STUBS) if (NOT USE_LL_STUBS)
use_prebuilt_binary( ndPhysicsStub ) use_prebuilt_binary( ndPhysicsStub )
if (WINDOWS)
set(LLPHYSICSEXTENSIONS_LIBRARIES
debug ${ARCH_PREBUILT_DIRS_DEBUG}/nd_hacdConvexDecomposition.lib
optimized ${ARCH_PREBUILT_DIRS_RELEASE}/nd_hacdConvexDecomposition.lib
debug ${ARCH_PREBUILT_DIRS_DEBUG}/hacd.lib
optimized ${ARCH_PREBUILT_DIRS_RELEASE}/hacd.lib
debug ${ARCH_PREBUILT_DIRS_DEBUG}/nd_Pathing.lib
optimized ${ARCH_PREBUILT_DIRS_RELEASE}/nd_Pathing.lib)
else ()
set(LLPHYSICSEXTENSIONS_LIBRARIES nd_hacdConvexDecomposition hacd nd_Pathing ) set(LLPHYSICSEXTENSIONS_LIBRARIES nd_hacdConvexDecomposition hacd nd_Pathing )
endif ()
set(LLPHYSICSEXTENSIONS_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/ ) set(LLPHYSICSEXTENSIONS_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/ )
else (NOT USE_LL_STUBS) else (NOT USE_LL_STUBS)
use_prebuilt_binary(llphysicsextensions_stub) use_prebuilt_binary(llphysicsextensions_stub)
......
# -*- cmake -*- # -*- cmake -*-
# these should be moved to their own cmake file # these should be moved to their own cmake file
include(Linking)
include(Prebuilt) include(Prebuilt)
include(Boost) include(Boost)
include(URIPARSER) include(URIPARSER)
...@@ -17,11 +18,12 @@ if (WINDOWS) ...@@ -17,11 +18,12 @@ if (WINDOWS)
set(LLPRIMITIVE_LIBRARIES set(LLPRIMITIVE_LIBRARIES
debug llprimitive debug llprimitive
optimized llprimitive optimized llprimitive
debug libcollada14dom23-sd debug ${ARCH_PREBUILT_DIRS_DEBUG}/libcollada14dom23-sd.lib
optimized libcollada14dom23-s optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libcollada14dom23-s.lib
${BOOST_FILESYSTEM_LIBRARY} ${BOOST_FILESYSTEM_LIBRARY}
${BOOST_SYSTEM_LIBRARIES} ${BOOST_SYSTEM_LIBRARIES}
libxml2_a debug ${ARCH_PREBUILT_DIRS_DEBUG}/libxml2_a.lib
optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libxml2_a.lib
${URIPARSER_LIBRARIES} ${URIPARSER_LIBRARIES}
${MINIZIP_LIBRARIES} ${MINIZIP_LIBRARIES}
${ZLIB_LIBRARIES} ${ZLIB_LIBRARIES}
......
# -*- cmake -*- # -*- cmake -*-
include(Linking) include(Linking)
include(Prebuilt)
if (USESYSTEMLIBS OR LINUX) if (USESYSTEMLIBS OR LINUX)
include(FindPkgConfig) include(FindPkgConfig)
...@@ -12,8 +14,8 @@ else () ...@@ -12,8 +14,8 @@ else ()
if (WINDOWS) if (WINDOWS)
set(VLC_LIBRARIES set(VLC_LIBRARIES
libvlc.lib ${ARCH_PREBUILT_DIRS_RELEASE}/libvlc.lib
libvlccore.lib ${ARCH_PREBUILT_DIRS_RELEASE}/libvlccore.lib
) )
elseif (DARWIN) elseif (DARWIN)
set(VLC_LIBRARIES set(VLC_LIBRARIES
......
...@@ -23,6 +23,7 @@ elseif (DARWIN) ...@@ -23,6 +23,7 @@ elseif (DARWIN)
set(EXE_STAGING_DIR "${CMAKE_BINARY_DIR}/sharedlibs") set(EXE_STAGING_DIR "${CMAKE_BINARY_DIR}/sharedlibs")
endif (WINDOWS) endif (WINDOWS)
if (NOT WINDOWS)
# Autobuild packages must provide 'release' versions of libraries, but may provide versions for # Autobuild packages must provide 'release' versions of libraries, but may provide versions for
# specific build types. AUTOBUILD_LIBS_INSTALL_DIRS lists first the build type directory and then # specific build types. AUTOBUILD_LIBS_INSTALL_DIRS lists first the build type directory and then
# the 'release' directory (as a default fallback). # the 'release' directory (as a default fallback).
...@@ -48,6 +49,7 @@ if (NOT "${CMAKE_BUILD_TYPE}" STREQUAL "Release") ...@@ -48,6 +49,7 @@ if (NOT "${CMAKE_BUILD_TYPE}" STREQUAL "Release")
endif (NOT "${CMAKE_BUILD_TYPE}" STREQUAL "Release") endif (NOT "${CMAKE_BUILD_TYPE}" STREQUAL "Release")
link_directories(${AUTOBUILD_LIBS_INSTALL_DIRS}) link_directories(${AUTOBUILD_LIBS_INSTALL_DIRS})
endif()
if (LINUX) if (LINUX)
set(DL_LIBRARY dl) set(DL_LIBRARY dl)
......
...@@ -15,7 +15,9 @@ if (NDOF) ...@@ -15,7 +15,9 @@ if (NDOF)
endif (WINDOWS OR DARWIN) endif (WINDOWS OR DARWIN)
if (WINDOWS) if (WINDOWS)
set(NDOF_LIBRARY libndofdev) set(NDOF_LIBRARY
debug ${ARCH_PREBUILT_DIRS_DEBUG}/libndofdev.lib
optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libndofdev.lib)
elseif (DARWIN OR LINUX) elseif (DARWIN OR LINUX)
set(NDOF_LIBRARY ndofdev) set(NDOF_LIBRARY ndofdev)
endif (WINDOWS) endif (WINDOWS)
......
include(Prebuilt) include(Prebuilt)
include(Linking)
set(NGHTTP2_FIND_QUIETLY ON) set(NGHTTP2_FIND_QUIETLY ON)
set(NGHTTP2_FIND_REQUIRED ON) set(NGHTTP2_FIND_REQUIRED ON)
...@@ -9,7 +10,8 @@ else (USESYSTEMLIBS) ...@@ -9,7 +10,8 @@ else (USESYSTEMLIBS)
use_prebuilt_binary(nghttp2) use_prebuilt_binary(nghttp2)
if (WINDOWS) if (WINDOWS)
set(NGHTTP2_LIBRARIES set(NGHTTP2_LIBRARIES
${ARCH_PREBUILT_DIRS_RELEASE}/nghttp2.lib debug ${ARCH_PREBUILT_DIRS_DEBUG}/nghttp2.lib
optimized ${ARCH_PREBUILT_DIRS_RELEASE}/nghttp2.lib
) )
elseif (DARWIN) elseif (DARWIN)
set(NGHTTP2_LIBRARIES libnghttp2.a) set(NGHTTP2_LIBRARIES libnghttp2.a)
......
...@@ -10,13 +10,16 @@ if (USE_OPENAL) ...@@ -10,13 +10,16 @@ if (USE_OPENAL)
else (USESYSTEMLIBS) else (USESYSTEMLIBS)
use_prebuilt_binary(openal) use_prebuilt_binary(openal)
if(WINDOWS) if(WINDOWS)
set(OPENAL_LIBRARIES OpenAL32) set(OPENAL_LIBRARIES
debug ${ARCH_PREBUILT_DIRS_DEBUG}/OpenAL32.lib
optimized ${ARCH_PREBUILT_DIRS_RELEASE}/OpenAL32.lib)
set(FREEALUT_LIBRARIES
debug ${ARCH_PREBUILT_DIRS_DEBUG}/alut.lib
optimized ${ARCH_PREBUILT_DIRS_RELEASE}/alut.lib)
else() else()
set(OPENAL_LIBRARIES openal) set(OPENAL_LIBRARIES openal)
endif()
set(OPENAL_INCLUDE_DIRS "${LIBS_PREBUILT_DIR}/include/")
set(FREEALUT_LIBRARIES alut) set(FREEALUT_LIBRARIES alut)
endif()
set(OPENAL_INCLUDE_DIRS "${LIBS_PREBUILT_DIR}/include/") set(OPENAL_INCLUDE_DIRS "${LIBS_PREBUILT_DIR}/include/")
endif (USESYSTEMLIBS) endif (USESYSTEMLIBS)
endif (USE_OPENAL) endif (USE_OPENAL)
...@@ -10,7 +10,9 @@ else (USESYSTEMLIBS) ...@@ -10,7 +10,9 @@ else (USESYSTEMLIBS)
use_prebuilt_binary(openjpeg) use_prebuilt_binary(openjpeg)
if(WINDOWS) if(WINDOWS)
set(OPENJPEG_LIBRARIES openjp2) set(OPENJPEG_LIBRARIES
debug ${ARCH_PREBUILT_DIRS_DEBUG}/openjp2.lib
optimized ${ARCH_PREBUILT_DIRS_RELEASE}/openjp2.lib)
else(WINDOWS) else(WINDOWS)
set(OPENJPEG_LIBRARIES openjp2) set(OPENJPEG_LIBRARIES openjp2)
endif(WINDOWS) endif(WINDOWS)
......
# -*- cmake -*- # -*- cmake -*-
include(Prebuilt) include(Prebuilt)
include(Linking)
set(OpenSSL_FIND_QUIETLY ON) set(OpenSSL_FIND_QUIETLY ON)
set(OpenSSL_FIND_REQUIRED ON) set(OpenSSL_FIND_REQUIRED ON)
...@@ -9,7 +10,13 @@ if (USESYSTEMLIBS) ...@@ -9,7 +10,13 @@ if (USESYSTEMLIBS)
else (USESYSTEMLIBS) else (USESYSTEMLIBS)
use_prebuilt_binary(openssl) use_prebuilt_binary(openssl)
if (WINDOWS) if (WINDOWS)
set(OPENSSL_LIBRARIES ssleay32 libeay32) set(SSLEAY_LIBRARY
debug ${ARCH_PREBUILT_DIRS_DEBUG}/ssleay32.lib
optimized ${ARCH_PREBUILT_DIRS_RELEASE}/ssleay32.lib)
set(LIBEAY_LIBRARY
debug ${ARCH_PREBUILT_DIRS_DEBUG}/libeay32.lib
optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libeay32.lib)
set(OPENSSL_LIBRARIES ${SSLEAY_LIBRARY} ${LIBEAY_LIBRARY})
else (WINDOWS) else (WINDOWS)
set(OPENSSL_LIBRARIES ssl crypto) set(OPENSSL_LIBRARIES ssl crypto)
endif (WINDOWS) endif (WINDOWS)
......
# -*- cmake -*- # -*- cmake -*-
include(Linking)
include(Prebuilt) include(Prebuilt)
set(PNG_FIND_QUIETLY ON) set(PNG_FIND_QUIETLY ON)
...@@ -10,8 +11,8 @@ else (USESYSTEMLIBS) ...@@ -10,8 +11,8 @@ else (USESYSTEMLIBS)
use_prebuilt_binary(libpng) use_prebuilt_binary(libpng)
if (WINDOWS) if (WINDOWS)
set(PNG_LIBRARIES set(PNG_LIBRARIES
debug libpng16d debug ${ARCH_PREBUILT_DIRS_DEBUG}/libpng16d.lib
optimized libpng16 optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libpng16.lib
) )
set(PNG_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/libpng16) set(PNG_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/libpng16)
elseif(DARWIN) elseif(DARWIN)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment