From afc0512dbed7ea37340d46e640a74083da365b23 Mon Sep 17 00:00:00 2001 From: lisyarus Date: Mon, 21 Sep 2020 20:20:34 +0300 Subject: [PATCH] Fix find scripts for windows --- cmake/modules/FindGMP.cmake | 6 +++++- cmake/modules/FindSDL2.cmake | 6 +++++- cmake/modules/FindSDL2_mixer.cmake | 24 ++++++++++++++---------- 3 files changed, 24 insertions(+), 12 deletions(-) diff --git a/cmake/modules/FindGMP.cmake b/cmake/modules/FindGMP.cmake index 6a0e05dc..0ff2a1b0 100644 --- a/cmake/modules/FindGMP.cmake +++ b/cmake/modules/FindGMP.cmake @@ -9,7 +9,11 @@ include(FindPackageHandleStandardArgs) find_package_handle_standard_args(GMP DEFAULT_MSG GMP_INCLUDE_DIRS GMP_LIBRARIES) if(GMP_FOUND AND NOT TARGET GMP) - add_library(GMP SHARED IMPORTED) + if(WIN32) + add_library(GMP STATIC IMPORTED) + else() + add_library(GMP SHARED IMPORTED) + endif() set_target_properties(GMP PROPERTIES IMPORTED_LOCATION "${GMP_LIBRARIES}" INTERFACE_INCLUDE_DIRECTORIES "${GMP_INCLUDE_DIRS}" diff --git a/cmake/modules/FindSDL2.cmake b/cmake/modules/FindSDL2.cmake index 412acd31..ab5e4793 100644 --- a/cmake/modules/FindSDL2.cmake +++ b/cmake/modules/FindSDL2.cmake @@ -9,7 +9,11 @@ include(FindPackageHandleStandardArgs) find_package_handle_standard_args(SDL2 DEFAULT_MSG SDL2_INCLUDE_DIRS SDL2_LIBRARIES) if(SDL2_FOUND AND NOT TARGET SDL2) - add_library(SDL2 SHARED IMPORTED) + if(WIN32) + add_library(SDL2 STATIC IMPORTED) + else() + add_library(SDL2 SHARED IMPORTED) + endif() set_target_properties(SDL2 PROPERTIES IMPORTED_LOCATION "${SDL2_LIBRARIES}" INTERFACE_INCLUDE_DIRECTORIES "${SDL2_INCLUDE_DIRS}" diff --git a/cmake/modules/FindSDL2_mixer.cmake b/cmake/modules/FindSDL2_mixer.cmake index 14ae0ddd..ef52dbf4 100644 --- a/cmake/modules/FindSDL2_mixer.cmake +++ b/cmake/modules/FindSDL2_mixer.cmake @@ -1,19 +1,23 @@ -if(SDL2_MIXER_FOUND) - set(SDL2_MIXER_FIND_QUIETLY TRUE) +if(SDL2_mixer_FOUND) + set(SDL2_mixer_FIND_QUIETLY TRUE) endif() -find_path(SDL2_MIXER_INCLUDE_DIRS NAMES "SDL2/SDL_mixer.h" PATHS "${SDL2_MIXER_ROOT}/include") -find_library(SDL2_MIXER_LIBRARIES NAMES "SDL2_mixer" PATHS "${SDL2_MIXER_ROOT}/lib") +find_path(SDL2_mixer_INCLUDE_DIRS NAMES "SDL2/SDL_mixer.h" PATHS "${SDL2_mixer_ROOT}/include") +find_library(SDL2_mixer_LIBRARIES NAMES "SDL2_mixer" PATHS "${SDL2_mixer_ROOT}/lib") include(FindPackageHandleStandardArgs) -find_package_handle_standard_args(SDL2_MIXER DEFAULT_MSG SDL2_MIXER_INCLUDE_DIRS SDL2_MIXER_LIBRARIES) +find_package_handle_standard_args(SDL2_mixer DEFAULT_MSG SDL2_mixer_INCLUDE_DIRS SDL2_mixer_LIBRARIES) -if(SDL2_MIXER_FOUND AND NOT TARGET SDL2_mixer) - add_library(SDL2_mixer SHARED IMPORTED) +if(SDL2_mixer_FOUND AND (NOT (TARGET SDL2_mixer))) + if(WIN32) + add_library(SDL2_mixer STATIC IMPORTED) + else() + add_library(SDL2_mixer SHARED IMPORTED) + endif() set_target_properties(SDL2_mixer PROPERTIES - IMPORTED_LOCATION "${SDL2_MIXER_LIBRARIES}" - INTERFACE_INCLUDE_DIRECTORIES "${SDL2_MIXER_INCLUDE_DIRS}" + IMPORTED_LOCATION "${SDL2_mixer_LIBRARIES}" + INTERFACE_INCLUDE_DIRECTORIES "${SDL2_mixer_INCLUDE_DIRS}" ) endif() -mark_as_advanced(SDL2_MIXER_INCLUDE_DIRS SDL2_MIXER_LIBRARIES) +mark_as_advanced(SDL2_mixer_INCLUDE_DIRS SDL2_mixer_LIBRARIES)