# HG changeset patch # User Ulf Nilsson # Date 1289396010 -3600 # Node ID 2ff15b63abf76546ef479a8078233b57014456d2 # Parent bd79bf3f7b33e2c5813d320d88d3e88daf20a32f cmake fixes for OS X diff --git a/Extensions/Terrain/Sample/CMakeLists.txt b/Extensions/Terrain/Sample/CMakeLists.txt --- a/Extensions/Terrain/Sample/CMakeLists.txt +++ b/Extensions/Terrain/Sample/CMakeLists.txt @@ -26,7 +26,7 @@ FIND_LIBRARY(COCOA_LIBRARY Cocoa) FIND_LIBRARY(APPLICATION_SERVICES_LIBRARY ApplicationServices) FIND_LIBRARY(AGL_LIBRARY AGL) - target_link_libraries(Terrain ${COCOA_LIBRARY} ${APPLICATION_SERVICES_LIBRARY} ${AGL_LIBRARY}) + target_link_libraries(Terrain Horde3D Horde3DUtils glfw ${COCOA_LIBRARY} ${APPLICATION_SERVICES_LIBRARY} ${AGL_LIBRARY}) endif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") diff --git a/Horde3D/Samples/Chicago/CMakeLists.txt b/Horde3D/Samples/Chicago/CMakeLists.txt --- a/Horde3D/Samples/Chicago/CMakeLists.txt +++ b/Horde3D/Samples/Chicago/CMakeLists.txt @@ -28,5 +28,5 @@ FIND_LIBRARY(COCOA_LIBRARY Cocoa) FIND_LIBRARY(APPLICATION_SERVICES_LIBRARY ApplicationServices) FIND_LIBRARY(AGL_LIBRARY AGL) - target_link_libraries(Chicago ${COCOA_LIBRARY} ${APPLICATION_SERVICES_LIBRARY} ${AGL_LIBRARY}) + target_link_libraries(Chicago Horde3D Horde3DUtils glfw ${COCOA_LIBRARY} ${APPLICATION_SERVICES_LIBRARY} ${AGL_LIBRARY}) endif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") diff --git a/Horde3D/Samples/Knight/CMakeLists.txt b/Horde3D/Samples/Knight/CMakeLists.txt --- a/Horde3D/Samples/Knight/CMakeLists.txt +++ b/Horde3D/Samples/Knight/CMakeLists.txt @@ -25,11 +25,6 @@ FIND_LIBRARY(COCOA_LIBRARY Cocoa) FIND_LIBRARY(APPLICATION_SERVICES_LIBRARY ApplicationServices) - FIND_LIBRARY(AGL_LIBRARY AGL) - IF(COCOA_LIBRARY) - target_link_libraries(Knight ${COCOA_LIBRARY} ${APPLICATION_SERVICES_LIBRARY} ${AGL_LIBRARY}) - ELSE(COCOA_LIBRARY) - FIND_LIBRARY(CARBON_LIBRARY Carbon) - target_link_libraries(Knight ${CARBON_LIBRARY} ${APPLICATION_SERVICES_LIBRARY} ${AGL_LIBRARY}) - ENDIF(COCOA_LIBRARY) + FIND_LIBRARY(AGL_LIBRARY AGL) + target_link_libraries(Knight Horde3D Horde3DUtils glfw ${COCOA_LIBRARY} ${APPLICATION_SERVICES_LIBRARY} ${AGL_LIBRARY}) endif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")