Created
December 7, 2010 20:16
-
-
Save sylvinus/732332 to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
commit bab65fe3b85eb778af9e8029252f62c630a061ab | |
Author: Sylvain Zimmer <[email protected]> | |
Date: Tue Dec 7 21:10:26 2010 +0100 | |
Fix CMakeList IFs to allow building on cmake 2.4.6 OS X 10.6 | |
diff --git a/CMakeLists.txt b/CMakeLists.txt | |
index 8fe8b72..15d2700 100644 | |
--- a/CMakeLists.txt | |
+++ b/CMakeLists.txt | |
@@ -59,7 +59,7 @@ ENDIF(PROJECT_OS_LINUX) | |
# Doesn't work on windows yet. | |
IF(NOT UNIX) | |
MESSAGE(FATAL_ERROR "libfreenect is not currently supported on this platform") | |
-ENDIF() | |
+ENDIF(NOT UNIX) | |
###################################################################################### | |
# CMake Modules | |
@@ -80,7 +80,7 @@ include (TestBigEndian) | |
test_big_endian(BIG_ENDIAN) | |
if(BIG_ENDIAN) | |
add_definitions(-DFN_BIGENDIAN) | |
-endif() | |
+endif(BIG_ENDIAN) | |
###################################################################################### | |
# CMake | |
@@ -102,19 +102,19 @@ add_subdirectory (src) | |
# Add examples | |
IF(BUILD_EXAMPLES) | |
add_subdirectory (examples) | |
-ENDIF() | |
+ENDIF(BUILD_EXAMPLES) | |
IF(BUILD_FAKENECT) | |
add_subdirectory (fakenect) | |
-ENDIF() | |
+ENDIF(BUILD_FAKENECT) | |
IF(BUILD_C_SYNC) | |
add_subdirectory (wrappers/c_sync) | |
-ENDIF() | |
+ENDIF(BUILD_C_SYNC) | |
IF(BUILD_AS3_SERVER) | |
add_subdirectory(wrappers/actionscript) | |
-ENDIF() | |
+ENDIF(BUILD_AS3_SERVER) | |
###################################################################################### | |
# Extras | |
diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt | |
index ac4a25b..e237f02 100755 | |
--- a/examples/CMakeLists.txt | |
+++ b/examples/CMakeLists.txt | |
@@ -24,7 +24,7 @@ else() | |
target_link_libraries(glview freenect ${OPENGL_LIBRARIES} ${GLUT_LIBRARY} ${CMAKE_THREAD_LIBS_INIT} m) | |
target_link_libraries(cppview freenect ${OPENGL_LIBRARIES} ${GLUT_LIBRARY} ${CMAKE_THREAD_LIBS_INIT} m) | |
target_link_libraries(glpclview freenect_sync ${OPENGL_LIBRARIES} ${GLUT_LIBRARY} ${CMAKE_THREAD_LIBS_INIT} m) | |
-endif() | |
+endif(APPLE) | |
install (TARGETS glview glpclview | |
DESTINATION bin) | |
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt | |
index 3a23f8c..830fbe4 100644 | |
--- a/src/CMakeLists.txt | |
+++ b/src/CMakeLists.txt | |
@@ -19,7 +19,7 @@ add_library (freenectstatic STATIC ${SRC}) | |
set_target_properties (freenectstatic PROPERTIES OUTPUT_NAME freenect) | |
IF(UNIX AND NOT APPLE) | |
SET_TARGET_PROPERTIES (freenectstatic PROPERTIES COMPILE_FLAGS "-fPIC") | |
-ENDIF() | |
+ENDIF(UNIX AND NOT APPLE) | |
install (TARGETS freenectstatic | |
DESTINATION "${PROJECT_LIBRARY_INSTALL_DIR}") | |
@@ -35,4 +35,4 @@ IF(UNIX AND NOT APPLE) | |
configure_file ("libfreenect.pc.in" "libfreenect.pc" @ONLY) | |
install (FILES "${CMAKE_CURRENT_BINARY_DIR}/libfreenect.pc" | |
DESTINATION "${PROJECT_LIBRARY_INSTALL_DIR}/pkgconfig") | |
-ENDIF() | |
+ENDIF(UNIX AND NOT APPLE) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment