diff options
| author | Manolo Gouy <Manolo> | 2015-04-08 09:33:39 +0000 |
|---|---|---|
| committer | Manolo Gouy <Manolo> | 2015-04-08 09:33:39 +0000 |
| commit | 9510c22bd31e7428c0baccfdfa7be43f0ff0d1d3 (patch) | |
| tree | ef97017644c6f04ea62bf9bc4d717877cb0b2e6d | |
| parent | ccffe4cf6378227b1fc5b59b1a71e4b9186434af (diff) | |
CMake building on Mac OS: the demo program uses and finds demo.menu in its bundle.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10686 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
| -rw-r--r-- | CMake/macros.cmake | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/CMake/macros.cmake b/CMake/macros.cmake index 234939f39..d89e9eecc 100644 --- a/CMake/macros.cmake +++ b/CMake/macros.cmake @@ -103,17 +103,20 @@ macro(CREATE_EXAMPLE NAME SOURCES LIBRARIES) endif(flsrcs) if(APPLE) - unset(ICON_NAME) + unset(RESOURCE_PATH) if(${tname} STREQUAL "blocks" OR ${tname} STREQUAL "checkers" OR ${tname} STREQUAL "sudoku") set( ICON_NAME ${tname}.icns ) - set( ICON_PATH "${PROJECT_SOURCE_DIR}/test/${tname}.app/Contents/Resources/${ICON_NAME}" ) + set( RESOURCE_PATH "${PROJECT_SOURCE_DIR}/test/${tname}.app/Contents/Resources/${ICON_NAME}" ) + elseif(${tname} STREQUAL "demo") + add_definitions(-DUSING_XCODE) + set( RESOURCE_PATH "${PROJECT_SOURCE_DIR}/test/demo.menu" ) endif(${tname} STREQUAL "blocks" OR ${tname} STREQUAL "checkers" OR ${tname} STREQUAL "sudoku") - if(DEFINED ICON_NAME ) - add_executable(${tname} MACOSX_BUNDLE ${srcs} ${ICON_PATH}) + if(DEFINED RESOURCE_PATH) + add_executable(${tname} MACOSX_BUNDLE ${srcs} ${RESOURCE_PATH}) else() add_executable(${tname} MACOSX_BUNDLE ${srcs} ${${tname}_FLTK_UI_SRCS}) - endif(DEFINED ICON_NAME) + endif(DEFINED RESOURCE_PATH) else() add_executable(${tname} WIN32 ${srcs} ${${tname}_FLTK_UI_SRCS}) endif(APPLE) @@ -121,10 +124,13 @@ macro(CREATE_EXAMPLE NAME SOURCES LIBRARIES) set_target_properties(${tname} PROPERTIES OUTPUT_NAME ${oname} ) - if(APPLE AND DEFINED ICON_NAME) + if(APPLE AND DEFINED RESOURCE_PATH) + if(NOT ${tname} STREQUAL "demo") set_target_properties(${tname} PROPERTIES MACOSX_BUNDLE_ICON_FILE ${ICON_NAME}) - set_target_properties(${tname} PROPERTIES RESOURCE ${ICON_PATH}) - endif(APPLE AND DEFINED 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}) |