diff --git a/CMakeLists.txt b/CMakeLists.txt index 71ad8669..b60be568 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -387,7 +387,6 @@ IF( ENABLE_SDL ) INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/sdl/vbam.cfg-example DESTINATION ${SYSCONFDIR} RENAME vbam.cfg) - INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/vba-over.ini DESTINATION ${DATA_INSTALL_DIR}) ENDIF( ENABLE_SDL ) IF( ENABLE_GTK ) @@ -410,3 +409,5 @@ if( ENABLE_GTK OR ENABLE_WX ) add_subdirectory(po) endif( ENABLE_NLS ) endif( ENABLE_GTK OR ENABLE_WX ) + +INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/vba-over.ini DESTINATION ${DATA_INSTALL_DIR}) diff --git a/src/gtk/CMakeLists.txt b/src/gtk/CMakeLists.txt index 510fe686..00269604 100644 --- a/src/gtk/CMakeLists.txt +++ b/src/gtk/CMakeLists.txt @@ -53,7 +53,27 @@ TARGET_LINK_LIBRARIES ( ) INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/gvbam DESTINATION bin) -INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/gvbam.desktop DESTINATION share/applications) -INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/icons/ DESTINATION share/icons/hicolor PATTERN ".svn" EXCLUDE) -INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/ui DESTINATION ${DATA_INSTALL_DIR} PATTERN ".svn" EXCLUDE) -INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/../vba-over.ini DESTINATION ${DATA_INSTALL_DIR}) +IF(NOT WIN32 AND NOT APPLE) + INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/gvbam.desktop DESTINATION share/applications) + INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/icons/ DESTINATION share/icons/hicolor PATTERN ".svn" EXCLUDE) + INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/ui DESTINATION ${DATA_INSTALL_DIR} PATTERN ".svn" EXCLUDE) +ENDIF(NOT WIN32 AND NOT APPLE) + +# for consistency with others, copy exe to top-level dir +if(WIN32) + SET(GTK_EXE_NAME gvbam${CMAKE_EXECUTABLE_SUFFIX}) + ADD_CUSTOM_COMMAND(TARGET gvbam POST_BUILD + COMMAND ${CMAKE_COMMAND} -E copy ${GTK_EXE_NAME} ../../${GTK_EXE_NAME}) +else(WIN32) +if(APPLE) + SET(GTK_EXE_NAME gvbam.app) + # this should set ROM file types correctly + SET_PROPERTY(TARGET gvbam APPEND PROPERTY MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/wxplist.in) +else(APPLE) + SET(GTK_EXE_NAME gvbam${CMAKE_EXECUTABLE_SUFFIX}) +endif(APPLE) + ADD_CUSTOM_COMMAND(TARGET gvbam POST_BUILD + # I'd rather make this link relative, but it's too hard + COMMAND rm -rf ../../${GTK_EXE_NAME} + COMMAND ln -s ${CMAKE_CURRENT_BINARY_DIR}/${GTK_EXE_NAME} ../../${GTK_EXE_NAME}) +endif(WIN32)