diff options
| author | ManoloFLTK <manolo> | 2018-12-04 15:11:21 +0100 |
|---|---|---|
| committer | ManoloFLTK <manolo> | 2018-12-04 15:11:21 +0100 |
| commit | fb4cb7165583b612ba95563445fa9d0685e2a75a (patch) | |
| tree | d6f7a8fae8b8c0cd1dcb1fbe4b9a5c4abb16f389 /fluid | |
| parent | d2870d6f7d378e374da515280e9434c605b1ac4e (diff) | |
| parent | 474d6e2393cf50ad46118c0b58b9ef396c5b3cce (diff) | |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'fluid')
| -rw-r--r-- | fluid/CMakeLists.txt | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/fluid/CMakeLists.txt b/fluid/CMakeLists.txt index 8f25ade91..94948f357 100644 --- a/fluid/CMakeLists.txt +++ b/fluid/CMakeLists.txt @@ -3,17 +3,17 @@ # # CMakeLists.txt to build fluid for the FLTK project using CMake (www.cmake.org) # -# Copyright 1998-2016 by Bill Spitzak and others. +# Copyright 1998-2018 by Bill Spitzak and others. # # This library is free software. Distribution and use rights are outlined in # the file "COPYING" which should have been included with this file. If this # file is missing or damaged, see the license at: # -# http://www.fltk.org/COPYING.php +# https://www.fltk.org/COPYING.php # # Please report all bugs and problems on the following page: # -# http://www.fltk.org/str.php +# https://www.fltk.org/str.php # @@ -50,8 +50,8 @@ else () endif (WIN32) if(APPLE AND (NOT OPTION_APPLE_X11) AND (NOT OPTION_APPLE_SDL)) - set( ICON_NAME fluid.icns ) - set( ICON_PATH "${PROJECT_SOURCE_DIR}/fluid/Fluid.app/Contents/Resources/${ICON_NAME}" ) + set(ICON_NAME fluid.icns) + set(ICON_PATH "${PROJECT_SOURCE_DIR}/fluid/fluid.app/Contents/Resources/${ICON_NAME}") add_executable(fluid MACOSX_BUNDLE ${CPPFILES} ${ICON_PATH}) else() add_executable(fluid WIN32 ${CPPFILES}) @@ -63,7 +63,7 @@ target_link_libraries(fluid fltk fltk_images fltk_forms) if(APPLE AND (NOT OPTION_APPLE_X11) AND (NOT OPTION_APPLE_SDL)) # create bundle - set_target_properties(fluid PROPERTIES MACOSX_BUNDLE_INFO_PLIST "${PROJECT_SOURCE_DIR}/fluid/Fluid.app/Contents/Info.plist" ) + set_target_properties(fluid PROPERTIES MACOSX_BUNDLE_INFO_PLIST "${PROJECT_SOURCE_DIR}/fluid/fluid.app/Contents/Info.plist") set_target_properties(fluid PROPERTIES MACOSX_BUNDLE_ICON_FILE ${ICON_NAME}) set_target_properties(fluid PROPERTIES RESOURCE ${ICON_PATH}) # install @@ -98,4 +98,3 @@ if(UNIX) endif(UNIX) endif(NOT ANDROID) - |