mirror of https://github.com/raysan5/raylib
Fix CMake support on Win32
This commit is contained in:
parent
94335e30df
commit
61181f2c49
|
@ -41,7 +41,7 @@ if (ENABLE_MSAN AND ENABLE_ASAN)
|
|||
MESSAGE(WARNING "Compiling with both AddressSanitizer and MemorySanitizer is not recommended")
|
||||
endif()
|
||||
|
||||
add_subdirectory(src release)
|
||||
add_subdirectory(src)
|
||||
|
||||
if (${BUILD_EXAMPLES})
|
||||
add_subdirectory(examples)
|
||||
|
|
|
@ -16,8 +16,8 @@ if (raylib_USE_STATIC_LIBS)
|
|||
set(XPREFIX ${XPREFIX}_STATIC)
|
||||
endif()
|
||||
|
||||
find_package(PkgConfig)
|
||||
pkg_check_modules(${XPREFIX} REQUIRED raylib)
|
||||
find_package(PkgConfig QUIET)
|
||||
pkg_check_modules(${XPREFIX} QUIET raylib)
|
||||
set(raylib_DEFINITIONS ${${XPREFIX}_CFLAGS})
|
||||
|
||||
find_path(raylib_INCLUDE_DIR
|
||||
|
@ -26,7 +26,7 @@ find_path(raylib_INCLUDE_DIR
|
|||
)
|
||||
|
||||
find_library(raylib_LIBRARY
|
||||
NAMES raylib
|
||||
NAMES raylib raylib_static
|
||||
HINTS ${${XPREFIX}_LIBRARY_DIRS}
|
||||
)
|
||||
|
||||
|
|
|
@ -188,6 +188,11 @@ if(SHARED)
|
|||
PUBLIC ${GRAPHICS}
|
||||
)
|
||||
|
||||
target_compile_definitions(raylib
|
||||
PRIVATE $<BUILD_INTERFACE:BUILD_LIBTYPE_SHARED>
|
||||
INTERFACE $<INSTALL_INTERFACE:USE_LIBTYPE_SHARED>
|
||||
)
|
||||
|
||||
set(PKG_CONFIG_LIBS_EXTRA "")
|
||||
|
||||
set_property(TARGET raylib PROPERTY POSITION_INDEPENDENT_CODE ON)
|
||||
|
@ -214,7 +219,9 @@ if(SHARED)
|
|||
if (WIN32)
|
||||
install(
|
||||
TARGETS raylib
|
||||
RUNTIME DESTINATION "lib"
|
||||
ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
|
||||
LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
|
||||
RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
|
||||
PUBLIC_HEADER DESTINATION "include"
|
||||
)
|
||||
else()
|
||||
|
|
Loading…
Reference in New Issue