summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore2
-rw-r--r--CMakeLists.txt12
2 files changed, 13 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index 8ac4a9fe..a7738f1d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,5 @@
4build-* 4build-*
5/.vsbuild 5/.vsbuild
6/.vscode 6/.vscode
7/lib
8
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2018c4c1..e90d1175 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -12,7 +12,16 @@ option (ENABLE_KERNING "Enable kerning in font renderer (slower)" ON)
12option (ENABLE_RESOURCE_EMBED "Embed resources inside the executable" OFF) 12option (ENABLE_RESOURCE_EMBED "Embed resources inside the executable" OFF)
13 13
14include (Embed.cmake) 14include (Embed.cmake)
15find_package (the_Foundation REQUIRED) 15if (EXISTS ${CMAKE_SOURCE_DIR}/lib/the_Foundation)
16 set (TFDN_STATIC_LIBRARY ON CACHE BOOL "Shared library not needed")
17 set (TFDN_ENABLE_INSTALL OFF CACHE BOOL "Library install not needed")
18 set (TFDN_ENABLE_TESTS OFF CACHE BOOL "Library tests not needed")
19 set (TFDN_ENABLE_WEBREQUEST OFF CACHE BOOL "libcurl not needed")
20 add_subdirectory (lib/the_Foundation)
21 add_library (the_Foundation::the_Foundation ALIAS the_Foundation)
22else ()
23 find_package (the_Foundation REQUIRED)
24endif ()
16find_package (PkgConfig REQUIRED) 25find_package (PkgConfig REQUIRED)
17pkg_check_modules (SDL2 REQUIRED sdl2) 26pkg_check_modules (SDL2 REQUIRED sdl2)
18 27
@@ -147,6 +156,7 @@ if (APPLE)
147 endif () 156 endif ()
148 set_target_properties (app PROPERTIES 157 set_target_properties (app PROPERTIES
149 OUTPUT_NAME "Lagrange" 158 OUTPUT_NAME "Lagrange"
159 BUILD_RPATH ${SDL2_LIBRARY_DIRS}
150 MACOSX_BUNDLE YES 160 MACOSX_BUNDLE YES
151 MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_LIST_DIR}/res/MacOSXBundleInfo.plist.in" 161 MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_LIST_DIR}/res/MacOSXBundleInfo.plist.in"
152 MACOSX_BUNDLE_BUNDLE_NAME "Lagrange" 162 MACOSX_BUNDLE_BUNDLE_NAME "Lagrange"