diff options
| author | myd7349 <[email protected]> | 2019-04-05 10:56:47 +0800 |
|---|---|---|
| committer | myd7349 <[email protected]> | 2019-04-09 18:03:25 +0800 |
| commit | 61181f2c49b823f691b42c6de63a5f9f130e18d6 (patch) | |
| tree | e5eeeeebc564cf995636fa034928a57b559b288b | |
| parent | 94335e30df6c66337eaad937048191c1735e6223 (diff) | |
| download | raylib-61181f2c49b823f691b42c6de63a5f9f130e18d6.tar.gz raylib-61181f2c49b823f691b42c6de63a5f9f130e18d6.zip | |
Fix CMake support on Win32
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | cmake/raylib-config.cmake | 6 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 9 |
3 files changed, 12 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index aebd4c4b..be74c4da 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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) diff --git a/cmake/raylib-config.cmake b/cmake/raylib-config.cmake index e2e5e9ae..76cc9048 100644 --- a/cmake/raylib-config.cmake +++ b/cmake/raylib-config.cmake @@ -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} ) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index c65a4996..c24853a1 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -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() |