diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9a1bba4b..f5e8ed84 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -86,10 +86,7 @@ ADD_DEFINITIONS(-DQT_NO_KEYWORDS) # To avoid conflicts with boost signals used i
 
 ####### OSX BUNDLE CMAKE_INSTALL_PREFIX #######
 OPTION(BUILD_AS_BUNDLE "Set to ON to build as bundle (DragNDrop)" OFF)
-IF(APPLE AND BUILD_AS_BUNDLE)
-    #Force to Off, easiest to package into the bundle
-    SET( BUILD_SHARED_LIBS OFF )
-  
+IF(APPLE AND BUILD_AS_BUNDLE) 
     # Required when packaging, and set CMAKE_INSTALL_PREFIX to "/".
     SET(CPACK_SET_DESTDIR TRUE) 
   
diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt
index e8de3fc0..3dd1a99f 100644
--- a/app/CMakeLists.txt
+++ b/app/CMakeLists.txt
@@ -15,6 +15,8 @@ SET(LIBRARIES
 #include files
 INCLUDE_DIRECTORIES(${INCLUDE_DIRS})
 
+SET(SRC_FILES main.cpp)
+
 # For Apple set the icns file containing icons
 IF(APPLE AND BUILD_AS_BUNDLE)
   # set how it shows up in the Info.plist file
@@ -40,11 +42,11 @@ ENDIF(WIN32)
 
 # create an executable file
 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)
-  ADD_EXECUTABLE(find_object_app WIN32 main.cpp)
+  ADD_EXECUTABLE(find_object_app WIN32 ${SRC_FILES})
 ELSE()
-  ADD_EXECUTABLE(find_object_app main.cpp)
+  ADD_EXECUTABLE(find_object_app ${SRC_FILES})
 ENDIF()
 # Linking with Qt libraries
 TARGET_LINK_LIBRARIES(find_object_app find_object ${LIBRARIES})