Skip to content

Added better support for static build #16

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Added better support for static build #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
305509a
Added better support for static build
Shylie May 8, 2023
8f3629f
Fix redundant target_link_libraries
Shylie May 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions Samples/Omni/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,5 +65,19 @@ if(WIN32)
target_link_libraries(SampleOmni winmm.lib)
endif()

if (NOT BUILD_SHARED_LIBS)
target_compile_definitions(SampleOmni PUBLIC BEARLIBTERMINAL_STATIC_BUILD)

target_link_libraries(SampleOmni picopng)
target_link_libraries(SampleOmni freetype2)
target_link_libraries(SampleOmni ${OPENGL_gl_LIBRARY})

if(LINUX)
target_link_libraries(SampleOmni pthread)
elseif(APPLE)
target_link_libraries(SampleOmni ${COCOA_LIBRARY})
endif()
endif()

set(OUTPUT_DIR ${CMAKE_SOURCE_DIR}/Output/${CMAKE_SYSTEM_NAME}${BITNESS})
set_target_properties(SampleOmni PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${OUTPUT_DIR})
26 changes: 18 additions & 8 deletions Terminal/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,12 @@ endif()

option(BUILD_SHARED_LIBS "Build dynamic version of library" ON)

# Detect system bitness
math(EXPR BITNESS "8*${CMAKE_SIZEOF_VOID_P}")

# Set output directory
set(OUTPUT_DIR ${CMAKE_SOURCE_DIR}/Output/${CMAKE_SYSTEM_NAME}${BITNESS})

add_subdirectory(Dependencies/FreeType)
add_subdirectory(Dependencies/PicoPNG)

Expand All @@ -20,8 +26,6 @@ else()
set(TERMINAL_VERSION "Unknown")
endif()

# Detect system bitness
math(EXPR BITNESS "8*${CMAKE_SIZEOF_VOID_P}")

file(GLOB TERMINAL_HEADERS ./Source/*.hpp ./Source/*.h)
list(APPEND TERMINAL_HEADERS "${CMAKE_CURRENT_SOURCE_DIR}/Include/C/BearLibTerminal.h")
Expand Down Expand Up @@ -80,19 +84,25 @@ elseif(APPLE)
target_link_libraries(BearLibTerminal ${COCOA_LIBRARY})
endif()

set(OUTPUT_DIR ${CMAKE_SOURCE_DIR}/Output/${CMAKE_SYSTEM_NAME}${BITNESS})

set_target_properties(BearLibTerminal PROPERTIES
RUNTIME_OUTPUT_DIRECTORY ${OUTPUT_DIR}
LIBRARY_OUTPUT_DIRECTORY ${OUTPUT_DIR}
ARCHIVE_OUTPUT_DIRECTORY ${OUTPUT_DIR})

if (WIN32)
# Fix unix-like "lib" prefix and ".a" suffix
set_target_properties(BearLibTerminal PROPERTIES
PREFIX ""
SUFFIX ".dll"
IMPORT_PREFIX ""
IMPORT_SUFFIX ".lib")
if (BUILD_SHARED_LIBS)
set_target_properties(BearLibTerminal PROPERTIES
PREFIX ""
SUFFIX ".dll"
IMPORT_PREFIX ""
IMPORT_SUFFIX ".lib")
else()
set_target_properties(BearLibTerminal PROPERTIES
PREFIX ""
SUFFIX ".lib")
endif()
elseif (APPLE)
set_target_properties(BearLibTerminal PROPERTIES
BUILD_WITH_INSTALL_RPATH TRUE
Expand Down
6 changes: 6 additions & 0 deletions Terminal/Dependencies/FreeType/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,3 +26,9 @@ if (UNIX)
endif()

add_library(freetype2 STATIC ${SOURCES})

set_target_properties(freetype2 PROPERTIES ARCHIVE_OUTPUT_DIRECTORY ${OUTPUT_DIR})

if (WIN32)
set_target_properties(freetype2 PROPERTIES PREFIX "" SUFFIX ".lib")
endif()
6 changes: 6 additions & 0 deletions Terminal/Dependencies/PicoPNG/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,9 @@ if (UNIX)
endif()

add_library(picopng STATIC ${SOURCES})

set_target_properties(picopng PROPERTIES ARCHIVE_OUTPUT_DIRECTORY ${OUTPUT_DIR})

if (WIN32)
set_target_properties(picopng PROPERTIES PREFIX "" SUFFIX ".lib")
endif()