# HG changeset patch # User koda # Date 1367278980 -7200 # Node ID 9774ad4fe17031ec38c5c9dc9bb7eaff87671872 # Parent bead90828a94939bce709773ed88cfe2e70f8ae8 fpc sysroot should belong to user configuration diff -r bead90828a94 -r 9774ad4fe170 cmake_modules/CMakePascalInformation.cmake --- a/cmake_modules/CMakePascalInformation.cmake Tue Mar 26 18:03:15 2013 +0100 +++ b/cmake_modules/CMakePascalInformation.cmake Tue Apr 30 01:43:00 2013 +0200 @@ -168,10 +168,6 @@ if(APPLE) #add user framework directory set(CMAKE_Pascal_UNIX_FLAGS "-Ff~/Library/Frameworks ${CMAKE_Pascal_UNIX_FLAGS}") - #when sysroot is set, make sure that fpc picks it - if(CMAKE_OSX_SYSROOT) - set(CMAKE_Pascal_UNIX_FLAGS "-XD${CMAKE_OSX_SYSROOT} ${CMAKE_Pascal_UNIX_FLAGS}") - endif(CMAKE_OSX_SYSROOT) endif(APPLE) endif(UNIX) diff -r bead90828a94 -r 9774ad4fe170 hedgewars/CMakeLists.txt --- a/hedgewars/CMakeLists.txt Tue Mar 26 18:03:15 2013 +0100 +++ b/hedgewars/CMakeLists.txt Tue Apr 30 01:43:00 2013 +0200 @@ -127,6 +127,11 @@ list(APPEND HW_LINK_LIBS SDLmain) add_flag_append(CMAKE_Pascal_FLAGS -Fl${LIBRARY_OUTPUT_PATH}) endif() + + #when sysroot is set, make sure that fpc picks it + if(CMAKE_OSX_SYSROOT) + set(add_flag_append "-XD${CMAKE_OSX_SYSROOT}") + endif(CMAKE_OSX_SYSROOT) endif(APPLE) if(FFMPEG_FOUND)