From 4b5b11a1cb0ecc8c2dc557cb87f897aa0fc1e1d5 Mon Sep 17 00:00:00 2001
From: Manolo Gouy <Manolo>
Date: Wed, 8 Apr 2015 11:37:14 +0000
Subject: CMake building on Mac OS: use a simpler way to put files within app
 bundles.

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10688 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
---
 CMake/macros.cmake | 28 ++++++++--------------------
 1 file changed, 8 insertions(+), 20 deletions(-)

(limited to 'CMake')

diff --git a/CMake/macros.cmake b/CMake/macros.cmake
index ef45bc034..623104d9a 100644
--- a/CMake/macros.cmake
+++ b/CMake/macros.cmake
@@ -103,22 +103,17 @@ macro(CREATE_EXAMPLE NAME SOURCES LIBRARIES)
     endif(flsrcs)
 
     if(APPLE)
-      unset(RESOURCE_PATH)
+      unset(ICON_NAME)
       if(${tname} STREQUAL "blocks" OR ${tname} STREQUAL "checkers" OR ${tname} STREQUAL "sudoku")
         set( ICON_NAME ${tname}.icns )
-        set( RESOURCE_PATH "${PROJECT_SOURCE_DIR}/test/${tname}.app/Contents/Resources/${ICON_NAME}" )
-      elseif(${tname} STREQUAL "demo")
-        set( RESOURCE_PATH "${PROJECT_SOURCE_DIR}/test/demo.menu" )
       endif(${tname} STREQUAL "blocks" OR ${tname} STREQUAL "checkers" OR ${tname} STREQUAL "sudoku")
-
-      if(DEFINED RESOURCE_PATH)
-        add_executable(${tname} MACOSX_BUNDLE ${srcs} ${RESOURCE_PATH})
-        if(${tname} STREQUAL "demo")
-          target_compile_definitions(demo PUBLIC USING_XCODE)
-        endif(${tname} STREQUAL "demo")
-      else()
-        add_executable(${tname} MACOSX_BUNDLE ${srcs} ${${tname}_FLTK_UI_SRCS})
-      endif(DEFINED RESOURCE_PATH)
+      add_executable(${tname} MACOSX_BUNDLE ${srcs} ${${tname}_FLTK_UI_SRCS})
+      if(DEFINED ICON_NAME)    
+        set_target_properties(${tname} PROPERTIES MACOSX_BUNDLE_ICON_FILE ${ICON_NAME})
+      endif(DEFINED ICON_NAME) 
+      if(${tname} STREQUAL "demo")
+        target_compile_definitions(demo PUBLIC USING_XCODE)
+      endif(${tname} STREQUAL "demo")
     else()
       add_executable(${tname} WIN32 ${srcs} ${${tname}_FLTK_UI_SRCS})
     endif(APPLE)
@@ -126,13 +121,6 @@ macro(CREATE_EXAMPLE NAME SOURCES LIBRARIES)
     set_target_properties(${tname}    
 	    PROPERTIES OUTPUT_NAME ${oname}
 	  )
-    if(APPLE AND DEFINED RESOURCE_PATH)    
-      if(NOT ${tname} STREQUAL "demo")
-        set_target_properties(${tname} PROPERTIES MACOSX_BUNDLE_ICON_FILE ${ICON_NAME})
-      endif(NOT ${tname} STREQUAL "demo")
-      set_target_properties(${tname} PROPERTIES RESOURCE ${RESOURCE_PATH})
-    endif(APPLE AND DEFINED RESOURCE_PATH)
-    
 
     target_link_libraries(${tname} ${LIBRARIES})
 
-- 
cgit v1.2.3