Mac OS X build fixes and other build fixes

tuttleofx · Nov 24, 2013 · da57fca · da57fca
1 parent 8268bf3
commit da57fca
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 6 deletions.
diff --git a/src/SeExpr/SeExprFunc.cpp b/src/SeExpr/SeExprFunc.cpp
@@ -23,6 +23,8 @@
 #include <dirent.h>
 #endif
 
+
+
 #include "SeExpression.h"
 #include "SeExprFunc.h"
 #include "SeExprNode.h"
@@ -190,7 +192,7 @@ SeExprFunc::getDocString(const char* functionName)
 
 #ifndef SEEXPR_WIN32
 
-#ifdef __APPLE__
+#if defined(__APPLE__) && !defined(__MAC_10_9)
 static int MatchPluginName(struct dirent* dir)
 #else
 static int MatchPluginName(const struct dirent* dir)

diff --git a/src/SeExpr/SePlatform.h b/src/SeExpr/SePlatform.h
@@ -22,6 +22,10 @@
     @brief Platform-specific classes, functions, and includes.
 */
 
+#ifdef __APPLE__
+#    include <Availability.h>
+#endif
+
 // platform-specific includes
 #if defined(_WIN32) || defined(_WINDOWS) || defined(_MSC_VER)
 #    ifndef WINDOWS

diff --git a/src/SeExprEditor/CMakeLists.txt b/src/SeExprEditor/CMakeLists.txt
@@ -14,6 +14,7 @@
 # You may obtain a copy of the License at
 # http://www.apache.org/licenses/LICENSE-2.0
 
+find_package(OpenGL)
 find_package(Qt4 COMPONENTS QtCore QtGui QtOpenGL) # find and setup Qt4 for this project
 if(QT4_FOUND)
 
@@ -47,6 +48,8 @@ ENDIF(WIN32)
     target_link_libraries(SeExprEditor ${QT_QTGUI_LIBRARY})
     target_link_libraries(SeExprEditor ${QT_QTOPENGL_LIBRARY})
     target_link_libraries(SeExprEditor ${QT_QTOPENGL_LIBRARY})
+    target_link_libraries(SeExprEditor ${GLUT_LIBRARY} ${OPENGL_LIBRARY})
+
 IF(WIN32)
     target_link_libraries(SeExprEditor opengl32)
 ENDIF(WIN32)

diff --git a/src/demos/imageEditor/CMakeLists.txt b/src/demos/imageEditor/CMakeLists.txt
@@ -19,7 +19,9 @@ cmake_policy(SET CMP0005 NEW)
 add_definitions(-DIMAGE_EDITOR_ROOT="${CMAKE_INSTALL_PREFIX}")
 
 find_package(Qt4 COMPONENTS QtCore QtGui) # find and setup Qt4 for this project
-if(QT4_FOUND)
+find_package(PNG)
+
+if(QT4_FOUND AND PNG_FOUND)
     set(imageEditor_MOC_HDRS ImageEditorDialog.h)
     set(imageEditor_CPPS imageEditor.cpp)
     qt4_wrap_cpp(imageEditor_MOC_SRCS ${imageEditor_MOC_HDRS})
@@ -31,14 +33,14 @@ if(QT4_FOUND)
     target_link_libraries(imageEditor ${QT_QTGUI_LIBRARY})
     target_link_libraries(imageEditor ${SEEXPR_LIBRARIES})
     target_link_libraries(imageEditor ${SEEXPR_EDITOR_LIBRARIES})
-endif(QT4_FOUND)
 
-FIND_PACKAGE(PNG)
-IF(PNG_FOUND)
     INCLUDE_DIRECTORIES(${PNG_INCLUDE_DIR})
     TARGET_LINK_LIBRARIES(imageEditor ${PNG_LIBRARIES})
     install(TARGETS imageEditor DESTINATION bin)
-ENDIF(PNG_FOUND)
+
+
+endif(QT4_FOUND)
+
 
 INSTALL( FILES fbm.se noisecolor1.se noisecolor2.se noise.se raytrace.se sinc.se DESTINATION ${CMAKE_INSTALL_PREFIX}/expressions/ )