ref: 14735caac3ab99ba3db29e24f6e26031c3385e0c
parent: 8ec8a8d9900429ff16c605c17a3361064d0b8e6b
author: Clownacy <[email protected]>
date: Sat Feb 29 12:52:00 EST 2020
Mark CMake target thingies as private
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -488,16 +488,16 @@
if(TARGET SDL2::SDL2)
# CMake-generated config (Arch, vcpkg, Raspbian)
message(STATUS "Using system SDL2")
- target_link_libraries(CSE2 SDL2::SDL2 SDL2::SDL2main)
+ target_link_libraries(CSE2 PRIVATE SDL2::SDL2 SDL2::SDL2main)
elseif(TARGET SDL2::SDL2-static)
# CMake-generated config (Arch, vcpkg, Raspbian)
message(STATUS "Using system SDL2")
- target_link_libraries(CSE2 SDL2::SDL2-static SDL2::SDL2main)
+ target_link_libraries(CSE2 PRIVATE SDL2::SDL2-static SDL2::SDL2main)
elseif(SDL2_FOUND)
# Autotools-generated config (MSYS2)
message(STATUS "Using system SDL2")
target_include_directories(CSE2 PRIVATE ${SDL2_INCLUDE_DIRS})- target_link_libraries(CSE2 ${SDL2_LIBRARIES})+ target_link_libraries(CSE2 PRIVATE ${SDL2_LIBRARIES})else()
# Compile it ourselves
message(STATUS "Using local SDL2")
@@ -506,7 +506,7 @@
set(LIBC ON) # Needed to prevent possible 'symbol already defined' errors
endif()
add_subdirectory("external/SDL2" EXCLUDE_FROM_ALL)- target_link_libraries(CSE2 SDL2-static SDL2main)
+ target_link_libraries(CSE2 PRIVATE SDL2-static SDL2main)
endif()
if(NOT FORCE_LOCAL_LIBS)
@@ -516,7 +516,7 @@
if(FREETYPE_FOUND)
message(STATUS "Using system FreeType")
target_include_directories(CSE2 PRIVATE ${FREETYPE_INCLUDE_DIRS})- target_link_libraries(CSE2 ${FREETYPE_LIBRARIES})+ target_link_libraries(CSE2 PRIVATE ${FREETYPE_LIBRARIES})else()
# Compile it ourselves
message(STATUS "Using local FreeType")
@@ -527,7 +527,7 @@
set(CMAKE_DISABLE_FIND_PACKAGE_BZip2 ON)
endif()
add_subdirectory("external/freetype" EXCLUDE_FROM_ALL)- target_link_libraries(CSE2 freetype)
+ target_link_libraries(CSE2 PRIVATE freetype)
endif()
if(RENDERER MATCHES "OpenGL3")
@@ -535,13 +535,13 @@
target_include_directories(CSE2 PRIVATE "external/glad/include")
find_package(OpenGL REQUIRED)
- target_link_libraries(CSE2 OpenGL::GL ${CMAKE_DL_LIBS})+ target_link_libraries(CSE2 PRIVATE OpenGL::GL ${CMAKE_DL_LIBS})endif()
if(RENDERER MATCHES "OpenGLES2")
find_package(OpenGLES2 REQUIRED)
target_include_directories(CSE2 PRIVATE ${OPENGLES2_INCLUDE_DIR})- target_link_libraries(CSE2 ${OPENGLES2_LIBRARIES})+ target_link_libraries(CSE2 PRIVATE ${OPENGLES2_LIBRARIES})endif()
##
--- a/DoConfig/CMakeLists.txt
+++ b/DoConfig/CMakeLists.txt
@@ -122,7 +122,7 @@
if(FLTK_FOUND)
message(STATUS "Using system FLTK")
target_include_directories(DoConfig PRIVATE ${FLTK_INCLUDE_DIR})- target_link_libraries(DoConfig ${FLTK_LIBRARIES})+ target_link_libraries(DoConfig PRIVATE ${FLTK_LIBRARIES})else()
# Compile it ourselves
message(STATUS "Using local FLTK")
@@ -139,7 +139,7 @@
add_subdirectory("fltk" EXCLUDE_FROM_ALL)get_target_property(DIRS fltk INCLUDE_DIRECTORIES) # FLTK doesn't mark its includes as PUBLIC or INTERFACE, so we have to do this stupidity
target_include_directories(DoConfig PRIVATE ${DIRS})- target_link_libraries(DoConfig fltk)
+ target_link_libraries(DoConfig PRIVATE fltk)
endif()
# Enable link-time optimisation if available