From 757aadf53efd604734d2f18be0eb80574a60c95f Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Tue, 2 Apr 2013 15:07:04 -0700 Subject: [PATCH] changes to CMakeLists to remove double links on OS X --- interface/CMakeLists.txt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/interface/CMakeLists.txt b/interface/CMakeLists.txt index bfeadda6d9..b04ea797bc 100644 --- a/interface/CMakeLists.txt +++ b/interface/CMakeLists.txt @@ -10,7 +10,8 @@ project(interface) if (APPLE) # link in required OS X frameworks and include the right GL headers - set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -framework CoreAudio -framework AudioToolbox -framework AudioUnit -framework CoreServices -framework Carbon -framework GLUT") + set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -framework CoreAudio -framework AudioToolbox + -framework AudioUnit -framework CoreServices -framework Carbon -framework GLUT") set(GL_HEADERS "#include \n#include ") else (APPLE) # include the right GL headers for UNIX @@ -19,7 +20,8 @@ endif (APPLE) if (WIN32) set(GLUT_ROOT_PATH ${CMAKE_CURRENT_SOURCE_DIR}/external/glut) - set(GL_HEADERS "#define GLEW_STATIC\n#define FREEGLUT_STATIC\n#define FREEGLUT_LIB_PRAGMAS 0\n#include \n#include \n#include ") + set(GL_HEADERS "#define GLEW_STATIC\n#define FREEGLUT_STATIC\n#define FREEGLUT_LIB_PRAGMAS 0\n + #include \n#include \n#include ") endif (WIN32) # create the InterfaceConfig.h file based on GL_HEADERS above