# HG changeset patch # User koda # Date 1386286135 -3600 # Node ID 322fe17363473c0e5fc9b102f94a53db636314b4 # Parent 966d180184b4d1ee8516e1302a1fa85c92d41b40 fix linking on osx by hardcoding the default library output path diff -r 966d180184b4 -r 322fe1736347 CMakeLists.txt --- a/CMakeLists.txt Fri Dec 06 00:02:10 2013 +0100 +++ b/CMakeLists.txt Fri Dec 06 00:28:55 2013 +0100 @@ -50,11 +50,12 @@ message(STATUS "Building ${HEDGEWARS_VERSION}-r${HEDGEWARS_REVISION} (${HEDGEWARS_HASH})") +#io library paths +include(${CMAKE_MODULE_PATH}/paths.cmake) #general utilities include(${CMAKE_MODULE_PATH}/utils.cmake) #platform specific init code include(${CMAKE_MODULE_PATH}/platform.cmake) -include(${CMAKE_MODULE_PATH}/paths.cmake) #when build type is not specified, assume Debug/Release according to build version information diff -r 966d180184b4 -r 322fe1736347 cmake_modules/platform.cmake --- a/cmake_modules/platform.cmake Fri Dec 06 00:02:10 2013 +0100 +++ b/cmake_modules/platform.cmake Fri Dec 06 00:28:55 2013 +0100 @@ -97,6 +97,9 @@ #add user framework directory add_flag_append(CMAKE_Pascal_FLAGS "-Ff~/Library/Frameworks") + + #workaround most of the -Fl settings getting lost + add_flag_append(CMAKE_Pascal_FLAGS "-k-L${LIBRARY_OUTPUT_PATH}") endif(APPLE) if(MINGW)