From 7a6e94959ceb5bda1fcd667dd91af73fc62f96cd Mon Sep 17 00:00:00 2001 From: Gary Talent Date: Sat, 16 Dec 2023 10:45:04 -0600 Subject: [PATCH] [nostalgia] Move nostalgia install vars to nostalgia dir CMakeLists.txt --- CMakeLists.txt | 20 -------------------- src/nostalgia/CMakeLists.txt | 20 ++++++++++++++++++++ 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 081d143f..3c56f822 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -28,26 +28,6 @@ set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib) set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib) set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) -if(APPLE) - set(CMAKE_MACOSX_RPATH OFF) - set(CMAKE_INSTALL_NAME_DIR "@executable_path/../Library/nostalgia") - set(NOSTALGIA_DIST_BIN NostalgiaStudio.app/Contents/MacOS) - set(NOSTALGIA_DIST_LIB NostalgiaStudio.app/Contents/Library) - set(NOSTALGIA_DIST_MODULE NostalgiaStudio.app/Contents/Plugins) - set(NOSTALGIA_DIST_RESOURCES NostalgiaStudio.app/Contents/Resources) - set(NOSTALGIA_DIST_MAC_APP_CONTENTS NostalgiaStudio.app/Contents) -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_LIB lib) - set(NOSTALGIA_DIST_MODULE lib) - set(NOSTALGIA_DIST_RESOURCES share) -endif() - add_subdirectory(deps/ox) include_directories( deps/ox/src diff --git a/src/nostalgia/CMakeLists.txt b/src/nostalgia/CMakeLists.txt index 73421210..d9d27dd7 100644 --- a/src/nostalgia/CMakeLists.txt +++ b/src/nostalgia/CMakeLists.txt @@ -1,6 +1,26 @@ #project packages +if(APPLE) + set(CMAKE_MACOSX_RPATH OFF) + set(CMAKE_INSTALL_NAME_DIR "@executable_path/../Library/nostalgia") + set(NOSTALGIA_DIST_BIN NostalgiaStudio.app/Contents/MacOS) + set(NOSTALGIA_DIST_LIB NostalgiaStudio.app/Contents/Library) + set(NOSTALGIA_DIST_MODULE NostalgiaStudio.app/Contents/Plugins) + set(NOSTALGIA_DIST_RESOURCES NostalgiaStudio.app/Contents/Resources) + set(NOSTALGIA_DIST_MAC_APP_CONTENTS NostalgiaStudio.app/Contents) +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_LIB lib) + set(NOSTALGIA_DIST_MODULE lib) + set(NOSTALGIA_DIST_RESOURCES share) +endif() + add_subdirectory(modules) if(NOSTALGIA_BUILD_PLAYER)