From c9c5545ce9ee04f9e74da81321d9e9622d2ae345 Mon Sep 17 00:00:00 2001
From: drausch <dominik.rausch@rwth-aachen.de>
Date: Fri, 24 Apr 2015 19:59:42 +0000
Subject: [PATCH] UPD: .inl files will be added as source files by
GenerateCMakeProjectFiles.py UPD: .inl files will be installed along with .h
files CHG: re-enabled installing of headers in release mode (no clue why this
was disabled)
git-svn-id: https://svn.rwth-aachen.de/repos/vrgroup-svn/projects/VistaCMakeCommon/trunk@49538 33c38b33-09d2-4561-8d4d-1bfa2f58f885
---
GenerateCMakeProjectFiles.py | 2 +-
VistaCommon.cmake | 46 ++++++++++++++++++------------------
2 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/GenerateCMakeProjectFiles.py b/GenerateCMakeProjectFiles.py
index 1405b2c..959a557 100755
--- a/GenerateCMakeProjectFiles.py
+++ b/GenerateCMakeProjectFiles.py
@@ -6,7 +6,7 @@ import os, sys, re, string
localSourceFileName = "_SourceFiles.cmake"
backupExtension = ".BAK"
excludeDirs = [ "cvs", ".svn", "build", "built", "cmake" ]
-sourceExtensions = [ ".c", ".cpp", ".h" ]
+sourceExtensions = [ ".c", ".cpp", ".h", ".inl" ]
addSourceFilesListToSources = True
defaultCoreLibsVersion = "PLUTO"
diff --git a/VistaCommon.cmake b/VistaCommon.cmake
index e4b77bc..048af65 100644
--- a/VistaCommon.cmake
+++ b/VistaCommon.cmake
@@ -1435,7 +1435,7 @@ macro( vista_install _PACKAGE_NAME )
# DESTINATION ${${_PACKAGE_NAME_UPPER}_BIN_INSTALLDIR}
# PERMISSIONS ${VISTA_INSTALL_PERMISSIONS_EXEC} )
#endif( WIN32 )
- else( ${_PACKAGE_NAME_UPPER}_TARGET_TYPE STREQUAL "APP" )
+ else()
install( TARGETS ${_PACKAGE_NAME}
LIBRARY DESTINATION ${${_PACKAGE_NAME_UPPER}_LIB_INSTALLDIR}
ARCHIVE DESTINATION ${${_PACKAGE_NAME_UPPER}_LIB_INSTALLDIR}
@@ -1443,24 +1443,24 @@ macro( vista_install _PACKAGE_NAME )
PERMISSIONS ${VISTA_INSTALL_PERMISSIONS_NONEXEC}
)
get_target_property( _SOURCE_FILES ${_PACKAGE_NAME} SOURCES )
- set( _HEADER_FILES )
- if( NOT CMAKE_BUILD_TYPE STREQUAL "Release" )
- foreach( _FILE ${_SOURCE_FILES} )
- get_filename_component( _EXTENSION_TMP ${_FILE} EXT )
- string( TOLOWER "${_EXTENSION_TMP}" _EXTENSION )
- if( "${_EXTENSION}" STREQUAL ".h" )
- get_filename_component( _PATH ${_FILE} PATH )
- string( REPLACE "src" "" _PATH "${_PATH}" )
- string( REPLACE "Src" "" _PATH "${_PATH}" )
- string( REPLACE "source" "" _PATH "${_PATH}" )
- string( REPLACE "Source" "" _PATH "${_PATH}" )
- string( REPLACE "include" "" _PATH "${_PATH}" )
- string( REPLACE "Include" "" _PATH "${_PATH}" )
- install( FILES ${_FILE} DESTINATION "${${_PACKAGE_NAME_UPPER}_INC_INSTALLDIR}/${_PATH}"
- PERMISSIONS ${VISTA_INSTALL_PERMISSIONS_NONEXEC} )
- endif( "${_EXTENSION}" STREQUAL ".h" )
- endforeach( _FILE _SOURCE_FILES )
- endif( NOT CMAKE_BUILD_TYPE STREQUAL "Release" )
+ foreach( _FILE ${_SOURCE_FILES} )
+ get_filename_component( _EXTENSION_TMP ${_FILE} EXT )
+ string( TOLOWER "${_EXTENSION_TMP}" _EXTENSION )
+ if( "${_EXTENSION}" STREQUAL ".h" OR "${_EXTENSION}" STREQUAL ".inl" )
+ get_filename_component( _PATH ${_FILE} PATH )
+ if( IS_ABSOLUTE "${_PATH}" )
+ file( RELATIVE_PATH _PATH "${CMAKE_CURRENT_SOURCE_DIR}" "${_PATH}" )
+ endif()
+ string( REPLACE "src" "" _PATH "${_PATH}" )
+ string( REPLACE "Src" "" _PATH "${_PATH}" )
+ string( REPLACE "source" "" _PATH "${_PATH}" )
+ string( REPLACE "Source" "" _PATH "${_PATH}" )
+ string( REPLACE "include" "" _PATH "${_PATH}" )
+ string( REPLACE "Include" "" _PATH "${_PATH}" )
+ install( FILES ${_FILE} DESTINATION "${${_PACKAGE_NAME_UPPER}_INC_INSTALLDIR}/${_PATH}"
+ PERMISSIONS ${VISTA_INSTALL_PERMISSIONS_NONEXEC} )
+ endif( )
+ endforeach()
if( ${_PACKAGE_NAME_UPPER}_INSTALL_SHADERS )
set ( _EXTENSIONS "vp" "fp" "glsl" )
@@ -1470,8 +1470,8 @@ macro( vista_install _PACKAGE_NAME )
install( FILES ${_FOUND_FILES}
DESTINATION "${${_PACKAGE_NAME_UPPER}_SHADER_INSTALLDIR}"
PERMISSIONS ${VISTA_INSTALL_PERMISSIONS_NONEXEC} )
- endforeach( _EXT ${_EXTENSIONS} )
- endif( ${_PACKAGE_NAME_UPPER}_INSTALL_SHADERS )
+ endforeach()
+ endif()
if( MSVC )
install( DIRECTORY "${${_PACKAGE_NAME_UPPER}_TARGET_OUTDIR}/"
@@ -1482,8 +1482,8 @@ macro( vista_install _PACKAGE_NAME )
PATTERN "CMakeFiles" EXCLUDE
PERMISSIONS ${VISTA_INSTALL_PERMISSIONS_NONEXEC}
)
- endif( MSVC )
- endif( ${_PACKAGE_NAME_UPPER}_TARGET_TYPE STREQUAL "APP" )
+ endif()
+ endif()
endmacro()
# vista_install_files_by_extension( SEARCH_ROOT INSTALL_SUBDIR [NON_RECURSIVE] [EXECUTABLE] EXTENSION1 [EXTENSION2 ...] )
--
GitLab