Update to target based cmake style.

Author: bluekyu

cmake/Findpanda3d.cmake

@@ -5,30 +5,25 @@
 # Findpanda3d.cmake
 #
 # Author: Younguk Kim (bluekyu)
-# Date  : 2016-08-02
+# Date  : 2017-05-19
 #
 # Result Variables
 # ^^^^^^^^^^^^^^^^
 #
 # This module defines the following variables::
 #
 #   panda3d_FOUND            - True if panda3d has been found and can be used
-#   panda3d_VERSION          - Library version for panda3d
-#   panda3d_VERSION_STRING   - Library version for panda3d
-#   panda3d_VERSION_MAJOR    - Library major version for panda3d
-#   panda3d_VERSION_MINOR    - Library minor version for panda3d
-#   panda3d_VERSION_PATCH    - Library patch version for panda3d
 #
 # The following `IMPORTED` targets are also defined::
 #
 #   panda3d::panda3d    - Target for the Panda3D necessary libraries.
 #   panda3d::<C>        - Target for specific Panda3D component.
 
-cmake_minimum_required(VERSION 3.2)
+cmake_minimum_required(VERSION 3.6)
 
 find_path(panda3d_INCLUDE_DIR
     NAMES "pandaFramework.h"
-    HINTS "${PANDA3D_ROOT}/include"
+    HINTS "${panda3d_ROOT}/include"
 )
 
 set(panda3d_DEFAULT_COMPONENTS p3framework panda pandaexpress p3dtool p3dtoolconfig p3direct p3interrogatedb)
@@ -42,7 +37,7 @@ list(REMOVE_ITEM panda3d_NON_DEFAULT_COMPONENTS ${panda3d_DEFAULT_COMPONENTS})
 foreach(COMPONENT_NAME ${panda3d_FIND_COMPONENTS})
     find_library(panda3d_${COMPONENT_NAME}_LIBRARY
         NAMES lib${COMPONENT_NAME}
-        HINTS "${PANDA3D_ROOT}/lib"
+        HINTS "${panda3d_ROOT}/lib"
     )
     list(APPEND panda3d_LIBRARY ${panda3d_${COMPONENT_NAME}_LIBRARY})
 endforeach()
@@ -57,7 +52,6 @@ include(FindPackageHandleStandardArgs)
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(panda3d
     FOUND_VAR panda3d_FOUND
     REQUIRED_VARS panda3d_LIBRARY panda3d_INCLUDE_DIR
-    VERSION_VAR panda3d_VERSION
 )
 
 if(panda3d_FOUND)
@@ -75,10 +69,13 @@ if(panda3d_FOUND)
                 IMPORTED_LOCATION "${panda3d_${COMPONENT_NAME}_LIBRARY}"
                 IMPORTED_LINK_INTERFACE_LANGUAGES "CXX"
             )
+
+            # Make variables changeable to the advanced user
+            mark_as_advanced(panda3d_${COMPONENT_NAME}_LIBRARY)
         endif()
     endforeach()
 
-    # create default target
+    # create interface target
     if(NOT TARGET panda3d::panda3d)
         add_library(panda3d::panda3d INTERFACE IMPORTED)
 
@@ -90,5 +87,7 @@ if(panda3d_FOUND)
             INTERFACE_INCLUDE_DIRECTORIES "${panda3d_INCLUDE_DIR}"
             INTERFACE_LINK_LIBRARIES "${_panda3d_DEFAULT_TARGET_DEPENDENCIES}"
         )
+
+        mark_as_advanced(panda3d_INCLUDE_DIR)
     endif()
 endif()

src/rpplugins/openvr/CMakeLists.txt

@@ -19,12 +19,11 @@ set(PROJECT_VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT
 # === plugin specific packages ===
 list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/CMake)
 
-# find OpenVR
-set(OPENVR_ROOT "" CACHE PATH "Hint for finding OpenVR root directory")
-set(OPENVR_INCLUDEDIR "" CACHE PATH "Hint for finding OpenVR include directory")
-set(OPENVR_LIBRARYDIR "" CACHE PATH "Hint for finding OpenVR library directory")
-
-find_package(OpenVR REQUIRED)
+if(NOT TARGET OpenVR)
+    # find OpenVR
+    set(OpenVR_ROOT "" CACHE PATH "Hint for finding OpenVR root directory")
+    find_package(OpenVR REQUIRED)
+endif()
 # ==================================================================================================
 
 # === target =======================================================================================
@@ -49,12 +48,10 @@ target_compile_definitions(${PROJECT_NAME}
 
 target_include_directories(${PROJECT_NAME}
     PRIVATE "${PROJECT_SOURCE_DIR}/include" "${PROJECT_BINARY_DIR}" "${PROJECT_SOURCE_DIR}/src"
-    ${OpenVR_INCLUDE_DIRS}
 )
 
 target_link_libraries(${PROJECT_NAME}
-    PRIVATE render_pipeline
-    PRIVATE ${OpenVR_LIBRARIES}
+    PRIVATE render_pipeline OpenVR
 )
 
 set_target_properties(${PROJECT_NAME} PROPERTIES
@@ -70,7 +67,7 @@ target_include_directories(${RPPLUGIN_ID}
 )
 
 target_link_libraries(${RPPLUGIN_ID}
-    INTERFACE render_pipeline
+    INTERFACE render_pipeline OpenVR
 )
 
 # configure package

src/rpplugins/openvr/cmake/FindOpenVR.cmake

@@ -5,70 +5,79 @@
 # FindOpenVR.cmake
 #
 # Author: Younguk Kim (bluekyu)
-# Date  : 2016-08-02
+# Date  : 2017-05-19
 #
 # Result Variables
 # ^^^^^^^^^^^^^^^^
 #
 # This module defines the following variables::
 #
-#   OpenVR_INCLUDE_DIRS     - Include directories for OpenVR
-#   OpenVR_LIBRARIES        - Libraries to link against OpenVR
 #   OpenVR_FOUND            - True if OpenVR has been found and can be used
-#   OpenVR_VERSION          - Library version for OpenVR
-#   OpenVR_VERSION_STRING   - Library version for OpenVR
-#   OpenVR_VERSION_MAJOR    - Library major version for OpenVR
-#   OpenVR_VERSION_MINOR    - Library minor version for OpenVR
-#   OpenVR_VERSION_PATCH    - Library patch version for OpenVR
 #
 # and the following imported targets::
 #
-#   OpenVR::OpenVR  - The OpenVR library
+#   OpenVR                  - The OpenVR library
 
-cmake_minimum_required(VERSION 3.2)
+cmake_minimum_required(VERSION 3.6)
 
-set(PLATFORM_PREFIX "")
+set(OpenVR_PLATFORM_PREFIX "")
 if(WIN32)
     if(CMAKE_SIZEOF_VOID_P EQUAL 8)
-        set(PLATFORM_PREFIX "win64")
+        set(OpenVR_PLATFORM_PREFIX "win64")
     else()
-        set(PLATFORM_PREFIX "win32")
+        set(OpenVR_PLATFORM_PREFIX "win32")
     endif()
 elseif(UNIX)
     if(CMAKE_SIZEOF_VOID_P EQUAL 8)
-        set(PLATFORM_PREFIX "linux64")
+        set(OpenVR_PLATFORM_PREFIX "linux64")
     else()
-        set(PLATFORM_PREFIX "linux32")
+        set(OpenVR_PLATFORM_PREFIX "linux32")
+    endif()
+elseif(APPLE)
+    if(CMAKE_SIZEOF_VOID_P EQUAL 8)
+        set(OpenVR_PLATFORM_PREFIX "osx64")
+    else()
+        set(OpenVR_PLATFORM_PREFIX "osx32")
     endif()
 else()
     message(FATAL_ERROR "Unknown platform: ${CMAKE_SYSTEM_NAME}")
+    return()
 endif()
 
 find_path(OpenVR_INCLUDE_DIR
     NAMES "openvr.h"
-    HINTS ${OPENVR_INCLUDEDIR} "${OPENVR_ROOT}/headers"
+    HINTS "${OpenVR_ROOT}/headers"
 )
+
 find_library(OpenVR_LIBRARY
     NAMES openvr_api
-    HINTS ${OPENVR_LIBRARYDIR} "${OPENVR_ROOT}/lib/${PLATFORM_PREFIX}"
+    HINTS "${OpenVR_ROOT}/lib"
+    PATH_SUFFIXES ${OpenVR_PLATFORM_PREFIX}
 )
 
 # Set OpenVR_FOUND
 include(FindPackageHandleStandardArgs)
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(OpenVR
     FOUND_VAR OpenVR_FOUND
     REQUIRED_VARS OpenVR_LIBRARY OpenVR_INCLUDE_DIR
-    VERSION_VAR OpenVR_VERSION
 )
 
 if(OpenVR_FOUND)
-    if(OpenVR_LIBRARY)
-        set(OpenVR_LIBRARIES    ${OpenVR_LIBRARY})
+    message(STATUS "Found the OpenVR")
+
+    add_library(OpenVR UNKNOWN IMPORTED)
+
+    if(EXISTS "${OpenVR_LIBRARY}")
+        set_target_properties(OpenVR PROPERTIES
+            INTERFACE_INCLUDE_DIRECTORIES "${OpenVR_INCLUDE_DIR}"
+            IMPORTED_LINK_INTERFACE_LANGUAGES "CXX"
+            IMPORTED_LOCATION "${OpenVR_LIBRARY}"
+        )
     endif()
-    set(OpenVR_INCLUDE_DIRS ${OpenVR_INCLUDE_DIR})
-endif()
 
-mark_as_advanced(
-    OpenVR_INCLUDE_DIRS
-    OpenVR_LIBRARIES
-)
+    # Make variables changeable to the advanced user
+    mark_as_advanced(
+        OpenVR_INCLUDE_DIR
+        OpenVR_LIBRARY
+    )
+endif()