WallyHackenslacker/Aerofoil
1
0
Fork 0
mirror of https://github.com/elasota/Aerofoil.git synced 2025-09-23 14:53:52 +00:00
Code Issues Projects Releases Wiki Activity

Refactor CMakeLists.txt

Browse Source 
The BUILD_INTERFACE generator expression isn't actually useful as we
don't use export(). CMAKE_CURRENT_SOURCE_DIR is also unnecessary as
CMake treats relative paths as relative to the current source directory
(or the current binary directory for outputs).
This commit is contained in:
Diomendius
2024-06-10 17:14:19 +12:00
parent de3fdeb7b1
commit 9aa82066f1
1 changed files with 26 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
CMakeLists.txt
View File

@@ -127,18 +127,18 @@ add_library(PortabilityLayer STATIC
) )
target_include_directories(PortabilityLayer PRIVATE target_include_directories(PortabilityLayer PRIVATE
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/Common> Common
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/GpCommon> GpCommon
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/PortabilityLayer> PortabilityLayer
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/zlib> zlib
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/rapidjson/include> rapidjson/include
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/MacRomanConversion> MacRomanConversion
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/stb> stb
) )
target_compile_options(PortabilityLayer PRIVATE -Wno-multichar) target_compile_options(PortabilityLayer PRIVATE -Wno-multichar)
target_link_libraries(PortabilityLayer zlib MacRomanConversion stb) target_link_libraries(PortabilityLayer PRIVATE zlib MacRomanConversion stb)
add_library(GpShell STATIC add_library(GpShell STATIC
@@ -153,9 +153,9 @@ add_library(GpShell STATIC
) )
target_include_directories(GpShell PRIVATE target_include_directories(GpShell PRIVATE
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/Common> Common
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/GpCommon> GpCommon
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/PortabilityLayer> PortabilityLayer
) )
add_library(GpApp STATIC add_library(GpApp STATIC
@@ -233,16 +233,15 @@ add_library(GpApp STATIC
target_compile_options(GpApp PRIVATE -Wno-multichar) target_compile_options(GpApp PRIVATE -Wno-multichar)
target_include_directories(GpApp PRIVATE target_include_directories(GpApp PRIVATE
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/Common> Common
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/GpCommon> GpCommon
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/PortabilityLayer> PortabilityLayer
) )
target_link_libraries(GpApp PortabilityLayer) target_link_libraries(GpApp PRIVATE PortabilityLayer)
if(CMAKE_HOST_UNIX) if(CMAKE_HOST_UNIX)
set(EXEC_SOURCES ) set(EXEC_SOURCES
list(APPEND EXEC_SOURCES
AerofoilPortable/GpSystemServices_POSIX.cpp AerofoilPortable/GpSystemServices_POSIX.cpp
AerofoilPortable/GpThreadEvent_Cpp11.cpp AerofoilPortable/GpThreadEvent_Cpp11.cpp
AerofoilPortable/GpAllocator_C.cpp AerofoilPortable/GpAllocator_C.cpp
@@ -260,21 +259,20 @@ if(CMAKE_HOST_UNIX)
AerofoilX/GpFileSystem_X.cpp AerofoilX/GpFileSystem_X.cpp
) )
set(EXEC_LIBS ) set(EXEC_LIBS
list(APPEND EXEC_LIBS
${SDL2_LIBRARIES} ${SDL2_LIBRARIES}
GpApp GpApp
GpShell GpShell
PortabilityLayer
) )
set(EXEC_INC_DIRS ) set(EXEC_INC_DIRS
list(APPEND EXEC_INC_DIRS Common
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/Common> GpCommon
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/GpCommon> GpShell
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/GpShell> AerofoilSDL
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/AerofoilSDL> AerofoilPortable
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/AerofoilPortable> PortabilityLayer
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/PortabilityLayer>
${SDL2_INCLUDE_DIRS} ${SDL2_INCLUDE_DIRS}
) )
if(PLATFORM STREQUAL "MAC") if(PLATFORM STREQUAL "MAC")
@@ -283,7 +281,7 @@ if(CMAKE_HOST_UNIX)
AerofoilMac/AerofoilMac/MacInit.mm AerofoilMac/AerofoilMac/MacInit.mm
) )
list(APPEND EXEC_INC_DIRS list(APPEND EXEC_INC_DIRS
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/AerofoilMac/AerofoilMac> AerofoilMac/AerofoilMac
) )
list(APPEND EXEC_LIBS list(APPEND EXEC_LIBS
"-framework Cocoa" "-framework Cocoa"