drinkingtea/nostalgia
drinkingtea/nostalgia
2
0
Fork 0
Code Issues 6 Pull Requests Actions Releases 6 Activity

Restore some global CMake setting that were moved to nostalgia

Browse Source
This commit is contained in:
Gary Talent 2023-12-16 20:08:26 -06:00
parent cfb7d4f861
commit 7bc1d90be8
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
CMakeLists.txt
View File

@ -28,6 +28,16 @@ set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib) set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
if(APPLE)
set(CMAKE_MACOSX_RPATH OFF)
else()
if(UNIX)
set(BUILD_SHARED_LIBS ON)
endif()
set(CMAKE_INSTALL_RPATH "$ORIGIN/../lib")
set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
endif()
add_subdirectory(deps/ox) add_subdirectory(deps/ox)
include_directories( include_directories(
deps/ox/src deps/ox/src

6
src/nostalgia/CMakeLists.txt
View File

@ -2,7 +2,6 @@
#project packages #project packages
if(APPLE) if(APPLE)
set(CMAKE_MACOSX_RPATH OFF)
set(CMAKE_INSTALL_NAME_DIR "@executable_path/../Library/nostalgia") set(CMAKE_INSTALL_NAME_DIR "@executable_path/../Library/nostalgia")
set(NOSTALGIA_DIST_BIN NostalgiaStudio.app/Contents/MacOS) set(NOSTALGIA_DIST_BIN NostalgiaStudio.app/Contents/MacOS)
set(NOSTALGIA_DIST_LIB NostalgiaStudio.app/Contents/Library) set(NOSTALGIA_DIST_LIB NostalgiaStudio.app/Contents/Library)
@ -10,11 +9,6 @@ if(APPLE)
set(NOSTALGIA_DIST_RESOURCES NostalgiaStudio.app/Contents/Resources) set(NOSTALGIA_DIST_RESOURCES NostalgiaStudio.app/Contents/Resources)
set(NOSTALGIA_DIST_MAC_APP_CONTENTS NostalgiaStudio.app/Contents) set(NOSTALGIA_DIST_MAC_APP_CONTENTS NostalgiaStudio.app/Contents)
else() else()
if(UNIX)
set(BUILD_SHARED_LIBS ON)
endif()
set(CMAKE_INSTALL_RPATH "$ORIGIN/../lib")
set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
set(NOSTALGIA_DIST_BIN bin) set(NOSTALGIA_DIST_BIN bin)
set(NOSTALGIA_DIST_LIB lib) set(NOSTALGIA_DIST_LIB lib)
set(NOSTALGIA_DIST_MODULE lib) set(NOSTALGIA_DIST_MODULE lib)