[Bf-blender-cvs] [c0ddaef] HMD_viewport: HMD: Cleanup of CMake file

[Sergey Sharybin]

Commit: c0ddaefb5d57cda608fb269e335879c306eb2e41
Author: Sergey Sharybin
Date:   Fri Mar 25 10:41:19 2016 +0100
Branches: HMD_viewport
https://developer.blender.org/rBc0ddaefb5d57cda608fb269e335879c306eb2e41

HMD: Cleanup of CMake file

===================================================================

M	extern/openhmd/CMakeLists.txt
D	extern/openhmd/src/Makefile.am

===================================================================

diff --git a/extern/openhmd/CMakeLists.txt b/extern/openhmd/CMakeLists.txt
index 763923d..457e424 100644
--- a/extern/openhmd/CMakeLists.txt
+++ b/extern/openhmd/CMakeLists.txt
@@ -1,62 +1,73 @@
-project(openhmd C CXX)
+# ***** BEGIN GPL LICENSE BLOCK *****
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+#
+# ***** END GPL LICENSE BLOCK *****
 
-if (!MSVC)
-	set(CMAKE_C_FLAGS "-std=c99")
-endif(!MSVC)
+set(INC
+	.
+	src
+	include
+)
 
-include_directories(${CMAKE_CURRENT_LIST_DIR}/include)
+set(INC_SYS
 
-if(MSVC)
-	add_definitions(-DOHMD_STATIC)
-endif(MSVC)
+)
 
-#source files set just for Android
-set(openhmd_source_files
-	${CMAKE_CURRENT_LIST_DIR}/src/openhmd.c
-	${CMAKE_CURRENT_LIST_DIR}/src/platform-win32.c
-	${CMAKE_CURRENT_LIST_DIR}/src/drv_dummy/dummy.c
-	${CMAKE_CURRENT_LIST_DIR}/src/omath.c
-	${CMAKE_CURRENT_LIST_DIR}/src/platform-posix.c
-	${CMAKE_CURRENT_LIST_DIR}/src/fusion.c
-)   
+set(SRC
+	src/openhmd.c
+	src/platform-win32.c
+	src/drv_dummy/dummy.c
+	src/omath.c
+	src/platform-posix.c
+	src/fusion.c
+)
 
+# TODO: Either remove this or move to main CMakeLists.txt
 OPTION(OPENHMD_DRIVER_OCULUS_RIFT "Oculus Rift DK1 and DK2" ON)
 OPTION(OPENHMD_DRIVER_EXTERNAL "External sensor driver" OFF)
 OPTION(OPENHMD_DRIVER_ANDROID "General Android driver" OFF)
 
+if(MSVC)
+	add_definitions(-DOHMD_STATIC)
+endif(MSVC)
+
+
 if(OPENHMD_DRIVER_OCULUS_RIFT)
-	set(openhmd_source_files ${openhmd_source_files} 
-	${CMAKE_CURRENT_LIST_DIR}/src/drv_oculus_rift/rift.c
-	${CMAKE_CURRENT_LIST_DIR}/src/drv_oculus_rift/packet.c
+	list(APPEND SRC
+		src/drv_oculus_rift/rift.c
+		src/drv_oculus_rift/packet.c
 	)
 	add_definitions(-DDRIVER_OCULUS_RIFT)
 
 	find_package(HIDAPI REQUIRED)
-	include_directories(${HIDAPI_INCLUDE_DIRS})
-	set(LIBS ${LIBS} ${HIDAPI_LIBRARIES})
-endif(OPENHMD_DRIVER_OCULUS_RIFT)
+	list(APPEND INC_SYS ${HIDAPI_INCLUDE_DIRS})
+endif()
 
-if (OPENHMD_DRIVER_EXTERNAL)
-	set(openhmd_source_files ${openhmd_source_files} 
-	${CMAKE_CURRENT_LIST_DIR}/src/drv_external/external.c
+if(OPENHMD_DRIVER_EXTERNAL)
+	list(append SRC
+		src/drv_external/external.c
 	)
 	add_definitions(-DDRIVER_EXTERNAL)
-endif(OPENHMD_DRIVER_EXTERNAL)
+endif()
 
-if (OPENHMD_DRIVER_ANDROID)
-	set(openhmd_source_files ${openhmd_source_files} 
-	${CMAKE_CURRENT_LIST_DIR}/src/drv_android/android.c
+if(OPENHMD_DRIVER_ANDROID)
+	list(append SRC
+		src/drv_android/android.c
 	)
 	add_definitions(-DDRIVER_ANDROID)
-endif(OPENHMD_DRIVER_ANDROID)
-
-set(INC
-	.
-	src
-)
-
-set(INC_SYS
-
-)
+endif()
 
-blender_add_lib(extern_openhmd "${openhmd_source_files}" "${INC}" "${INC_SYS}")
+blender_add_lib(extern_openhmd "${SRC}" "${INC}" "${INC_SYS}")
diff --git a/extern/openhmd/src/Makefile.am b/extern/openhmd/src/Makefile.am
deleted file mode 100644
index 77ade86..0000000
--- a/extern/openhmd/src/Makefile.am
+++ /dev/null
@@ -1,40 +0,0 @@
-AUTOMAKE_OPTIONS = subdir-objects
-library_includedir=$(includedir)/openhmd
-library_include_HEADERS = $(top_srcdir)/include/openhmd.h
-
-lib_LTLIBRARIES = libopenhmd.la
-libopenhmd_la_SOURCES = \
-	openhmd.c \
-	platform-win32.c \
-	drv_dummy/dummy.c \
-	omath.c \
-	platform-posix.c \
-	fusion.c
-
-libopenhmd_la_LDFLAGS = -no-undefined -version-info 0:0:0
-libopenhmd_la_CPPFLAGS = -fPIC -I$(top_srcdir)/include -Wall 
-
-if BUILD_DRIVER_OCULUS_RIFT
-
-libopenhmd_la_SOURCES += \
-	drv_oculus_rift/rift.c \
-	drv_oculus_rift/packet.c
-
-libopenhmd_la_CPPFLAGS += $(hidapi_CFLAGS) -DDRIVER_OCULUS_RIFT
-libopenhmd_la_LDFLAGS += $(hidapi_LIBS)
-
-endif
-
-if BUILD_DRIVER_EXTERNAL
-
-libopenhmd_la_SOURCES += \
-	drv_external/external.c
-endif
-
-if BUILD_DRIVER_ANDROID
-
-libopenhmd_la_SOURCES += \
-	drv_android/android.c
-endif
-
-libopenhmd_la_LDFLAGS += $(EXTRA_LD_FLAGS)