diff options
| author | Ray <raysan5@gmail.com> | 2019-04-22 19:32:15 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-22 19:32:15 +0200 |
| commit | e41cb774c2426896a198152bdac7ff2f99223bd6 (patch) | |
| tree | 5187711cc6ddcadc61fe0d862b8ec8cd2edbedd8 | |
| parent | cd934c9f669f22dc49304a722c8acd36b94b9321 (diff) | |
| parent | 148eefb9bb67a4b72bb90ea9a740db3cc3c081d3 (diff) | |
| download | raylib-e41cb774c2426896a198152bdac7ff2f99223bd6.tar.gz raylib-e41cb774c2426896a198152bdac7ff2f99223bd6.zip | |
Merge pull request #789 from myd7349/fix-cmake-for-win32
Fix CMake support on Win32
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | cmake/raylib-config.cmake | 19 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 11 |
3 files changed, 24 insertions, 8 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..5ad55b16 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 @@ -25,10 +25,17 @@ find_path(raylib_INCLUDE_DIR HINTS ${${XPREFIX}_INCLUDE_DIRS} ) -find_library(raylib_LIBRARY - NAMES raylib - HINTS ${${XPREFIX}_LIBRARY_DIRS} -) +if (raylib_USE_STATIC_LIBS) + find_library(raylib_LIBRARY + NAMES raylib_static + HINTS ${${XPREFIX}_LIBRARY_DIRS} + ) +else () + find_library(raylib_LIBRARY + NAMES raylib + HINTS ${${XPREFIX}_LIBRARY_DIRS} + ) +endif () set(raylib_LIBRARIES ${raylib_LIBRARY}) set(raylib_LIBRARY_DIRS ${${XPREFIX}_LIBRARY_DIRS}) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index c65a4996..7b69e0f9 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -188,6 +188,13 @@ if(SHARED) PUBLIC ${GRAPHICS} ) + if(MSVC) + target_compile_definitions(raylib + PRIVATE $<BUILD_INTERFACE:BUILD_LIBTYPE_SHARED> + INTERFACE $<INSTALL_INTERFACE:USE_LIBTYPE_SHARED> + ) + endif() + set(PKG_CONFIG_LIBS_EXTRA "") set_property(TARGET raylib PROPERTY POSITION_INDEPENDENT_CODE ON) @@ -214,7 +221,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() |