apoorva/greenhouse
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed Find-Object.app not opening on start (it was because OSX adds an argument -psn_0_##### which wasn't recognized by Find-Object... so it immediatly exited with error "LSOpenURLsWithRole() failed with error -10810")

Browse Source 
git-svn-id: http://find-object.googlecode.com/svn/trunk/find_object@406 620bd6b2-0a58-f614-fd9a-1bd335dccda9
This commit is contained in:
matlabbe 2014-08-29 01:18:55 +00:00
parent e3f1b28a5a
commit b3024cb1dc
3 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -85,7 +85,9 @@ FIND_PACKAGE(Qt4 COMPONENTS QtCore QtGui QtNetwork REQUIRED) # tested on Qt4.8
ADD_DEFINITIONS(-DQT_NO_KEYWORDS) # To avoid conflicts with boost signals used in ROS ADD_DEFINITIONS(-DQT_NO_KEYWORDS) # To avoid conflicts with boost signals used in ROS
####### OSX BUNDLE CMAKE_INSTALL_PREFIX ####### ####### OSX BUNDLE CMAKE_INSTALL_PREFIX #######
OPTION(BUILD_AS_BUNDLE "Set to ON to build as bundle (DragNDrop)" OFF) IF(APPLE)
OPTION(BUILD_AS_BUNDLE "Set to ON to build as bundle (DragNDrop)" OFF)
ENDIF(APPLE)
IF(APPLE AND BUILD_AS_BUNDLE) IF(APPLE AND BUILD_AS_BUNDLE)
# Required when packaging, and set CMAKE_INSTALL_PREFIX to "/". # Required when packaging, and set CMAKE_INSTALL_PREFIX to "/".
SET(CPACK_SET_DESTDIR TRUE) SET(CPACK_SET_DESTDIR TRUE)

2
app/CMakeLists.txt
View File

@ -77,8 +77,8 @@ IF(APPLE AND BUILD_AS_BUNDLE)
WORKING_DIRECTORY \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/bin)") WORKING_DIRECTORY \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/bin)")
ENDIF(APPLE AND BUILD_AS_BUNDLE) ENDIF(APPLE AND BUILD_AS_BUNDLE)
SET(APPS "\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/bin/${PROJECT_NAME}${CMAKE_EXECUTABLE_SUFFIX}")
IF((APPLE AND BUILD_AS_BUNDLE) OR WIN32) IF((APPLE AND BUILD_AS_BUNDLE) OR WIN32)
SET(APPS "\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/bin/${PROJECT_NAME}${CMAKE_EXECUTABLE_SUFFIX}")
SET(plugin_dest_dir bin) SET(plugin_dest_dir bin)
SET(qtconf_dest_dir bin) SET(qtconf_dest_dir bin)
IF(APPLE) IF(APPLE)

8
app/main.cpp
View File

@ -137,6 +137,13 @@ int main(int argc, char* argv[])
for(int i=1; i<argc; ++i) for(int i=1; i<argc; ++i)
{ {
#ifdef __APPLE__
if(QString(argv[i]).startsWith("-psn"))
{
//safely ignore
continue;
}
#endif
if(strcmp(argv[i], "-objs") == 0 || if(strcmp(argv[i], "-objs") == 0 ||
strcmp(argv[i], "--objs") == 0 || strcmp(argv[i], "--objs") == 0 ||
strcmp(argv[i], "-objects") == 0 || strcmp(argv[i], "-objects") == 0 ||
@ -474,4 +481,5 @@ int main(int argc, char* argv[])
delete findObject; delete findObject;
} }
return 0;
} }