Merge pull request #30 from robpieke/osxBuild

Address build issues on OS X

Author: aselle

src/SeExprEditor/CMakeLists.txt

@@ -91,8 +91,8 @@ ENDIF(WIN32)
     set(CMAKE_CXX_FLAGS "-std=c++0x")
     set(CMAKE_INSTALL_PYTHON "${PYTHON_SITE}/SeExpr" )
     include_directories(${SIP_INCLUDE_DIR} ${PYQT4_SIP}
-                        ${PYTHON_INCLUDE_DIR} ${QT_INCLUDE_DIR}/QtCore
-                        ${QT_INCLUDE_DIR}/QtGui)
+                        ${PYTHON_INCLUDE_DIR} ${QT_HEADERS_DIR}/QtCore
+                        ${QT_HEADERS_DIR}/QtGui)
 
     add_custom_command(OUTPUT sipexpreditorpart0.cpp
                        DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/SeExprEditor.sip

src/demos/rman/CMakeLists.txt

@@ -21,7 +21,7 @@ STRING(COMPARE EQUAL "${RMANTREE_TEST}" "" RMAN_SET)
 IF(NOT ${RMAN_SET})
 include_directories($ENV{RMANTREE}/include)
 link_directories($ENV{RMANTREE}/lib)
-add_library(SeExprOp SHARED seop.cpp)
+add_library(SeExprOp MODULE seop.cpp)
 target_link_libraries(SeExprOp prman ${SEEXPR_LIBRARIES})
 FILE(GLOB ribs "*.rib")
 install (TARGETS SeExprOp DESTINATION ${CMAKE_INSTALL_LIBDIR}/prman)