diff --git a/src/psmoveclient/ClientVersion.h b/src/psmoveclient/ClientVersion.h deleted file mode 100644 index 6aedf4f9..00000000 --- a/src/psmoveclient/ClientVersion.h +++ /dev/null @@ -1,28 +0,0 @@ -#ifndef CLIENT_VERSION_H -#define CLIENT_VERSION_H - -/// Conventional string-ification macro. -// From: http://stackoverflow.com/questions/5256313/c-c-macro-string-concatenation -#if !defined(PSM_STRINGIZE) - #define PSM_STRINGIZEIMPL(x) #x - #define PSM_STRINGIZE(x) PSM_STRINGIZEIMPL(x) -#endif - -#define PSM_PRODUCT_VERSION 0 -#define PSM_MAJOR_VERSION 9 -#define PSM_PHASE alpha -#define PSM_MINOR_VERSION 5 -#define PSM_PATCH_VERSION 5 -#define PSM_BUILD_NUMBER 8 - -/// "Product.Major-Phase Minor.Patch" -#if !defined(PSM_VERSION_STRING) - #define PSM_VERSION_STRING PSM_STRINGIZE(PSM_PRODUCT_VERSION.PSM_MAJOR_VERSION-PSM_PHASE PSM_MINOR_VERSION.PSM_PATCH_VERSION) -#endif - -/// "Product.Major-Phase Minor.Patch.Build" -#if !defined(PSM_DETAILED_VERSION_STRING) - #define PSM_DETAILED_VERSION_STRING PSM_STRINGIZE(PSM_PRODUCT_VERSION.PSM_MAJOR_VERSION-PSM_PHASE PSM_MINOR_VERSION.PSM_PATCH_VERSION.PSM_BUILD_NUMBER) -#endif - -#endif // CLIENT_VERSION_H diff --git a/src/psmoveprotocol/CMakeLists.txt b/src/psmoveprotocol/CMakeLists.txt index 396fd67e..04307c31 100644 --- a/src/psmoveprotocol/CMakeLists.txt +++ b/src/psmoveprotocol/CMakeLists.txt @@ -26,3 +26,12 @@ target_include_directories(PSMoveProtocol PUBLIC ${PSMOVEPROTOCOL_INCLUDE_DIRS} target_link_libraries(PSMoveProtocol PRIVATE ${PSMOVEPROTOCOL_REQUIRED_LIBS}) set_target_properties(PSMoveProtocol PROPERTIES COMPILE_FLAGS "-DBUILDING_STATIC_LIBRARY -fPIC") + +# Install +IF(${CMAKE_SYSTEM_NAME} MATCHES "Windows") + install(FILES ProtocolVersion.h + DESTINATION ${ROOT_DIR}/${PSM_PROJECT_NAME}/${ARCH_LABEL}/include) +ELSE() #Linux/Darwin + install(FILES ProtocolVersion.h + DESTINATION include) +ENDIF() \ No newline at end of file