Commit 34863df2 authored by Dipl.-Ing. Jonas Stienen's avatar Dipl.-Ing. Jonas Stienen
Browse files

Configuration files install problem fixed, now not skipping when VACore.ini already exists

parent e3d959c6
......@@ -334,7 +334,11 @@ vista_create_default_info_file( VACore )
set_property( TARGET VACore PROPERTY FOLDER "VA" )
# VA core configuration file
configure_file( "conf/VACore.ini.proto" "${CMAKE_CURRENT_SOURCE_DIR}/conf/${ITA_VACORE_DEFAULT_CONFIG_FILE_NAME}" @ONLY )
if( NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/conf/${ITA_VACORE_DEFAULT_CONFIG_FILE_NAME}" )
configure_file( "conf/VACore.ini.proto" "${CMAKE_CURRENT_SOURCE_DIR}/conf/${ITA_VACORE_DEFAULT_CONFIG_FILE_NAME}" @ONLY )
else()
message( "conf/VACore.ini exists, skipping overwrite. Manually remove generated conf/VACore.ini first, if you want to re-generate from default prototype config file." )
endif()
# deploy
if( ITA_VACORE_DEPLOY_WITH_COMMON_DATA )
......@@ -342,11 +346,7 @@ if( ITA_VACORE_DEPLOY_WITH_COMMON_DATA )
endif( )
if( ITA_VACORE_DEPLOY_WITH_COMMON_CONFIGS )
if( NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/conf/${ITA_VACORE_DEFAULT_CONFIG_FILE_NAME}" )
install( DIRECTORY "conf" DESTINATION "." FILES_MATCHING PATTERN "*.ini" )
else()
message( "conf/VACore.ini exists, skipping overwrite. Manually remove generated conf/VACore.ini first, if you want to re-generate from default prototype config file." )
endif()
install( DIRECTORY "conf" DESTINATION "." FILES_MATCHING PATTERN "*.ini" )
endif( )
if( ITA_VACORE_DEPLOY_WITH_COMMON_SCRIPTS )
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment