@@ -7,6 +7,9 @@ include(FeatureSummary)
7
7
set_property (GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS OFF )
8
8
set_property (GLOBAL PROPERTY FIND_LIBRARY_USE_LIB32_PATHS ON )
9
9
10
+ # Added for conan generator
11
+ set (CMAKE_MODULE_PATH ${CMAKE_BINARY_DIR} ${CMAKE_MODULE_PATH} )
12
+
10
13
# Required for stdbool.h
11
14
set (CMAKE_C_STANDARD 99)
12
15
# For nullptr in C++
@@ -49,8 +52,9 @@ if(ENABLE_OPENGL)
49
52
find_package (OpenGL REQUIRED)
50
53
add_definitions (-DUSE_OPENGL)
51
54
if (WIN32 )
52
- list (APPEND OPENGL_INCLUDE_DIRS ${CMAKE_SOURCE_DIR} /build_ext/built_glew/include )
53
- list (APPEND OPENGL_LIBRARIES ${CMAKE_SOURCE_DIR} /build_ext/built_glew/lib/libglew32.dll.a winmm)
55
+ find_package (glew REQUIRED)
56
+ list (APPEND OPENGL_INCLUDE_DIRS ${glew_INCLUDE_DIRS} )
57
+ list (APPEND OPENGL_LIBRARIES glew:glew winmm)
54
58
endif (WIN32 )
55
59
endif (ENABLE_OPENGL)
56
60
@@ -61,11 +65,9 @@ if(ENABLE_SDL2 MATCHES "ON")
61
65
endif (SDL2_FOUND)
62
66
endif (ENABLE_SDL2 MATCHES "ON" )
63
67
if (ENABLE_SDL2 MATCHES "BUNDLED" )
64
- set (SDL2_DIR ${CMAKE_SOURCE_DIR} /build_ext/built_sdl)
65
- find_library (SDL2_LIBRARY SDL2 PATHS ${SDL2_DIR} /lib NO_DEFAULT_PATH)
66
- find_library (SDL2MAIN_LIBRARY SDL2main PATHS ${SDL2_DIR} /lib NO_DEFAULT_PATH)
67
- set (SDL2_INCLUDE_DIRS ${SDL2_DIR} /include /SDL2)
68
- set (SDL2_LIBRARIES "${SDL2MAIN_LIBRARY} ;${SDL2_LIBRARY} " )
68
+ find_package (sdl2 REQUIRED)
69
+ set (SDL2_INCLUDE_DIRS ${sdl2_INCLUDE_DIRS} )
70
+ set (SDL2_LIBRARIES sdl2::sdl2)
69
71
endif (ENABLE_SDL2 MATCHES "BUNDLED" )
70
72
71
73
if (ENABLE_SOUND MATCHES "ON" )
@@ -75,10 +77,10 @@ if(ENABLE_SOUND MATCHES "ON")
75
77
add_definitions (-DUSE_SDL_MIXER=1)
76
78
endif (ENABLE_SOUND MATCHES "ON" )
77
79
if (ENABLE_SOUND MATCHES "BUNDLED" )
78
- set (SDL2_MIXER_DIR ${CMAKE_SOURCE_DIR} /build_ext/built_sdl_mixer )
79
- set (SDL2_MIXER_INCLUDE_DIRS ${SDL2_MIXER_DIR} / include /SDL2 )
80
- find_library (SDL2_MIXER_LIBRARY SDL2_mixer PATHS ${SDL2_MIXER_DIR} /lib)
81
- set (SDL2_MIXER_LIBRARIES ${SDL2_MIXER_LIBRARY} )
80
+ find_package (sdl2_mixer REQUIRED )
81
+ set (SDL2_MIXER_INCLUDE_DIRS ${sdl2_mixer_INCLUDE_DIRS} )
82
+ # FIXME additional dependencies ogg and opus
83
+ set (SDL2_MIXER_LIBRARIES sdl2_mixer::sdl2_mixer ogg::ogg opus::opus )
82
84
add_definitions (-DUSE_SDL_MIXER=1)
83
85
endif (ENABLE_SOUND MATCHES "BUNDLED" )
84
86
@@ -88,9 +90,9 @@ if(ENABLE_FLUIDSYNTH MATCHES "ON")
88
90
add_definitions ("-DUSE_FLUIDSYNTH=1" )
89
91
endif (ENABLE_FLUIDSYNTH MATCHES "ON" )
90
92
if (ENABLE_FLUIDSYNTH MATCHES "BUNDLED" )
91
- find_library (FLUIDSYNTH_LIBRARY fluidsynth PATHS ${CMAKE_SOURCE_DIR} /build_ext/fluidsynth-lite/src )
92
- set (FLUIDSYNTH_INCLUDE_DIRS ${CMAKE_SOURCE_DIR} /build_ext/fluidsynth-lite/ include )
93
- set (FLUIDSYNTH_LIBRARIES ${FLUIDSYNTH_LIBRARY} )
93
+ find_package ( fluidsynth REQUIRED )
94
+ set (FLUIDSYNTH_INCLUDE_DIRS ${fluidsynth_INCLUDE_DIRS} )
95
+ set (FLUIDSYNTH_LIBRARIES fluidsynth::fluidsynth )
94
96
add_definitions ("-DUSE_FLUIDSYNTH=1" )
95
97
endif (ENABLE_FLUIDSYNTH MATCHES "BUNDLED" )
96
98
0 commit comments