diff options
| author | Manolo Gouy <Manolo> | 2015-04-08 12:16:52 +0000 |
|---|---|---|
| committer | Manolo Gouy <Manolo> | 2015-04-08 12:16:52 +0000 |
| commit | 3ec8bab10efb8ffb403aa81b439e9635fe641f8f (patch) | |
| tree | be3758c5e2c9fe4198c5c693af76ca92f4047da1 /CMake | |
| parent | 4b5b11a1cb0ecc8c2dc557cb87f897aa0fc1e1d5 (diff) | |
CMake build on Mac OS: r10688 was not a good move because it works with
the makefiles generator but not with the Xcode generator. Stepping back one commit.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10689 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'CMake')
| -rw-r--r-- | CMake/macros.cmake | 28 |
1 files changed, 20 insertions, 8 deletions
diff --git a/CMake/macros.cmake b/CMake/macros.cmake index 623104d9a..ef45bc034 100644 --- a/CMake/macros.cmake +++ b/CMake/macros.cmake @@ -103,17 +103,22 @@ 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( 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") - 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") + + 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) else() add_executable(${tname} WIN32 ${srcs} ${${tname}_FLTK_UI_SRCS}) endif(APPLE) @@ -121,6 +126,13 @@ 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}) |