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

fixed not installed icns in mac os x bundle

Browse Source 
git-svn-id: http://find-object.googlecode.com/svn/trunk/find_object@404 620bd6b2-0a58-f614-fd9a-1bd335dccda9
This commit is contained in:
matlabbe 2014-08-28 21:36:23 +00:00
parent 98bf4e6887
commit 33baa6e171
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CMakeLists.txt
View File

@ -86,10 +86,7 @@ ADD_DEFINITIONS(-DQT_NO_KEYWORDS) # To avoid conflicts with boost signals used i
####### OSX BUNDLE CMAKE_INSTALL_PREFIX ####### ####### OSX BUNDLE CMAKE_INSTALL_PREFIX #######
OPTION(BUILD_AS_BUNDLE "Set to ON to build as bundle (DragNDrop)" OFF) OPTION(BUILD_AS_BUNDLE "Set to ON to build as bundle (DragNDrop)" OFF)
IF(APPLE AND BUILD_AS_BUNDLE) IF(APPLE AND BUILD_AS_BUNDLE)
#Force to Off, easiest to package into the bundle
SET( BUILD_SHARED_LIBS OFF )
# 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)

8
app/CMakeLists.txt
View File

@ -15,6 +15,8 @@ SET(LIBRARIES
#include files #include files
INCLUDE_DIRECTORIES(${INCLUDE_DIRS}) INCLUDE_DIRECTORIES(${INCLUDE_DIRS})
SET(SRC_FILES main.cpp)
# For Apple set the icns file containing icons # For Apple set the icns file containing icons
IF(APPLE AND BUILD_AS_BUNDLE) IF(APPLE AND BUILD_AS_BUNDLE)
# set how it shows up in the Info.plist file # set how it shows up in the Info.plist file
@ -40,11 +42,11 @@ ENDIF(WIN32)
# create an executable file # create an executable file
IF(APPLE AND BUILD_AS_BUNDLE) IF(APPLE AND BUILD_AS_BUNDLE)
ADD_EXECUTABLE(find_object_app MACOSX_BUNDLE main.cpp) ADD_EXECUTABLE(find_object_app MACOSX_BUNDLE ${SRC_FILES})
ELSEIF(MINGW) ELSEIF(MINGW)
ADD_EXECUTABLE(find_object_app WIN32 main.cpp) ADD_EXECUTABLE(find_object_app WIN32 ${SRC_FILES})
ELSE() ELSE()
ADD_EXECUTABLE(find_object_app main.cpp) ADD_EXECUTABLE(find_object_app ${SRC_FILES})
ENDIF() ENDIF()
# Linking with Qt libraries # Linking with Qt libraries
TARGET_LINK_LIBRARIES(find_object_app find_object ${LIBRARIES}) TARGET_LINK_LIBRARIES(find_object_app find_object ${LIBRARIES})