Skip to content

Commit a565d99

Browse files
Eliza VelasquezEliza Velasquez
Eliza Velasquez
authored and
Eliza Velasquez
committed
Use target_* functions for dependencies
1 parent 3948be1 commit a565d99

File tree

1 file changed

+12
-18
lines changed

1 file changed

+12
-18
lines changed

CMakeLists.txt

+12-18
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,11 @@ macro(doption name help default def)
1212
endmacro()
1313

1414
macro(make_simple_import name varname header library)
15-
add_library(${name} UNKNOWN IMPORTED)
15+
add_library(${name} INTERFACE)
1616
find_path(${varname}_INCLUDE ${header})
1717
find_library(${varname}_LIB NAMES ${library}-static ${library})
18-
set_target_properties(${name} PROPERTIES
19-
INTERFACE_INCLUDE_DIRECTORIES "${${varname}_INCLUDE}"
20-
IMPORTED_LOCATION "${${varname}_LIB}")
18+
target_include_directories(${name} INTERFACE "${${varname}_INCLUDE}")
19+
target_link_libraries(${name} INTERFACE "${${varname}_LIB}")
2120
endmacro()
2221

2322
option(BUILD_SHARED_LIBS "build shared library" ON)
@@ -38,12 +37,11 @@ doption(ENABLE_PHYSFS "enable PhysicsFS in playsound" OFF SUPPORT_PHYSFS)
3837
doption(STATIC_FLAC "FLAC should be linked as a static library" OFF FLAC__NO_DLL)
3938

4039
# SDL2
41-
add_library(SDL2::SDL2 UNKNOWN IMPORTED)
40+
add_library(SDL2::SDL2 INTERFACE)
4241
find_path(SDL2_INCLUDE SDL.h PATH_SUFFIXES SDL2)
4342
find_library(SDL2_LIB NAMES SDL2 SDL2d)
44-
set_target_properties(SDL2::SDL2 PROPERTIES
45-
INTERFACE_INCLUDE_DIRECTORIES "${SDL2_INCLUDE}"
46-
IMPORTED_LOCATION "${SDL2_LIB}")
43+
target_include_directories(SDL2::SDL2 INTERFACE "${SDL2_INCLUDE}")
44+
target_link_libraries(SDL2::SDL2 INTERFACE "${SDL2_LIB}")
4745
if(WIN32)
4846
set(libs user32 gdi32 winmm imm32 ole32 oleaut32 version uuid advapi32 shell32)
4947
else()
@@ -52,21 +50,18 @@ else()
5250
list(APPEND libs rt)
5351
endif()
5452
endif()
55-
set_target_properties(SDL2::SDL2 PROPERTIES
56-
INTERFACE_LINK_LIBRARIES "${libs}")
53+
target_link_libraries(SDL2::SDL2 INTERFACE "${libs}")
5754
unset(libs)
5855

5956
if(WIN32)
60-
add_library(SDL2::SDL2main UNKNOWN IMPORTED)
57+
add_library(SDL2::SDL2main INTERFACE)
6158
set(libs)
6259
if(MINGW)
6360
list(APPEND libs mingw32)
6461
endif()
6562
find_library(SDL2MAIN_LIB NAMES SDL2main SDL2maind)
6663
list(APPEND libs "${SDL2MAIN_LIB}")
67-
set_target_properties(SDL2::SDL2main PROPERTIES
68-
IMPORTED_LOCATION "${SDL2MAIN_LIB}"
69-
INTERFACE_LINK_LIBRARIES "${libs}")
64+
target_link_libraries(SDL2::SDL2main INTERFACE "${libs}")
7065
unset(libs)
7166
else()
7267
add_library(SDL2::SDL2main INTERFACE IMPORTED)
@@ -95,12 +90,11 @@ endif()
9590

9691
# ogg/flac
9792
if(ENABLE_FLAC)
98-
add_library(ogg::FLAC UNKNOWN IMPORTED)
93+
add_library(ogg::FLAC INTERFACE)
9994
find_path(FLAC_INCLUDE FLAC/stream_decoder.h)
10095
find_library(FLAC_LIB NAMES flac FLAC)
101-
set_target_properties(ogg::FLAC PROPERTIES
102-
INTERFACE_INCLUDE_DIRECTORIES "${FLAC_INCLUDE}"
103-
IMPORTED_LOCATION "${FLAC_LIB}")
96+
target_include_directories(ogg::FLAC INTERFACE "${FLAC_INCLUDE}")
97+
target_link_libraries(ogg::FLAC INTERFACE "${FLAC_LIB}")
10498
endif()
10599

106100
# ogg/speex

0 commit comments

Comments
 (0)