spacecruft
/
CelestiaContent
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use relative path on tools

pull/3/head
Li Linfeng 2019-08-03 15:01:47 +08:00 committed by Hleb Valoshka
parent 589face93e
commit 8743edad9e
4 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@ -193,6 +193,7 @@ endif()
if(NATIVE_OSX_APP) if(NATIVE_OSX_APP)
set(CMAKE_INSTALL_PREFIX "${PROJECT_BINARY_DIR}/${PROJECT_NAME}.app/Contents") set(CMAKE_INSTALL_PREFIX "${PROJECT_BINARY_DIR}/${PROJECT_NAME}.app/Contents")
set(CMAKE_INSTALL_FULL_LOCALEDIR "${CMAKE_INSTALL_PREFIX}/Resources/locale") set(CMAKE_INSTALL_FULL_LOCALEDIR "${CMAKE_INSTALL_PREFIX}/Resources/locale")
set(CMAKE_INSTALL_BINDIR "MacOS")
set(DATADIR "${CMAKE_INSTALL_PREFIX}/Resources") set(DATADIR "${CMAKE_INSTALL_PREFIX}/Resources")
set(FULL_DATADIR "${CMAKE_INSTALL_PREFIX}/Resources") set(FULL_DATADIR "${CMAKE_INSTALL_PREFIX}/Resources")
else() else()

4
src/celestia/qt/CMakeLists.txt
View File

@ -73,9 +73,7 @@ if(APPLE)
set_property(TARGET celestia-qt APPEND_STRING PROPERTY LINK_FLAGS " -framework CoreFoundation") set_property(TARGET celestia-qt APPEND_STRING PROPERTY LINK_FLAGS " -framework CoreFoundation")
set_property(TARGET celestia-qt APPEND_STRING PROPERTY LINK_FLAGS " -framework CoreServices") set_property(TARGET celestia-qt APPEND_STRING PROPERTY LINK_FLAGS " -framework CoreServices")
endif() endif()
install(TARGETS celestia-qt RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
if(NATIVE_OSX_APP) if(NATIVE_OSX_APP)
install(TARGETS celestia-qt RUNTIME DESTINATION MacOS)
install(FILES ../macosx/celestia.icns DESTINATION Resources) install(FILES ../macosx/celestia.icns DESTINATION Resources)
else()
install(TARGETS celestia-qt RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
endif() endif()

4
src/tools/spice2xyzv/spice2xyzv.cpp
View File

@ -588,7 +588,11 @@ int main(int argc, char* argv[])
} }
// Load the leap second kernel // Load the leap second kernel
#if defined(_WIN32) || defined(NATIVE_OSX_APP)
furnsh_c("naif0012.tls");
#else
furnsh_c(CONFIG_DATA_DIR "/" "naif0012.tls"); furnsh_c(CONFIG_DATA_DIR "/" "naif0012.tls");
#endif
writeCommentHeader(config, cout); writeCommentHeader(config, cout);
convertSpkToXyzv(config, cout); convertSpkToXyzv(config, cout);

2
src/tools/stardb/buildstardb.cpp
View File

@ -22,7 +22,7 @@
using namespace std; using namespace std;
using namespace celmath; using namespace celmath;
#ifdef _WIN32 #if defined(_WIN32) || defined(NATIVE_OSX_APP)
static string MainDatabaseFile("hip_main.dat"); static string MainDatabaseFile("hip_main.dat");
static string TychoDatabaseFile("tyc_main.dat"); static string TychoDatabaseFile("tyc_main.dat");
static string ComponentDatabaseFile("h_dm_com.dat"); static string ComponentDatabaseFile("h_dm_com.dat");