Commit 57d0d9e5 authored by Max Lyon's avatar Max Lyon
Browse files

rename ACG to VCI in CMake

parent 452bff83
Pipeline #16181 failed with stages
in 5 minutes and 28 seconds
......@@ -13,8 +13,8 @@ endif()
set (CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake ${CMAKE_CURRENT_SOURCE_DIR}/cmake-library/finders ${CMAKE_CURRENT_SOURCE_DIR}/cmake-library/VCI)
set (CMAKE_DEBUG_POSTFIX "d")
include (ACGCommon)
include(ACGQt)
include (VCICommon)
include(VCIQt)
# Flag to enable or disable QT widgets in CoMISo
set( WANT_COMISO_QT ON CACHE BOOL "Enable Qt support in CoMISo" )
......@@ -26,7 +26,7 @@ if( WANT_COMISO_QT )
Qt5Widgets
)
acg_qt5 ()
vci_qt5 ()
if( QT5_FOUND)
add_definitions (-DQT5_FOUND)
......@@ -37,9 +37,9 @@ if( WANT_COMISO_QT )
endif( WANT_COMISO_QT )
acg_get_version ()
vci_get_version ()
include (ACGOutput)
include (VCIOutput)
set(COMISO_INCLUDE_DIRECTORIES "")
set(COMISO_LINK_DIRECTORIES "")
......@@ -378,11 +378,11 @@ set (directories
)
# collect all header,source and ui files
acg_append_files (headers "*.hh" ${directories})
acg_append_files (sources "*.cc" ${directories})
vci_append_files (headers "*.hh" ${directories})
vci_append_files (sources "*.cc" ${directories})
if( QT5_FOUND )
acg_append_files (ui "*.ui" ${directories})
vci_append_files (ui "*.ui" ${directories})
endif()
macro (of_list_filter _list)
......@@ -399,7 +399,7 @@ of_list_filter ( headers )
of_list_filter ( sources )
# remove template cc files from source file list
acg_drop_templates (sources)
vci_drop_templates (sources)
if ( QT5_FOUND )
# Enable automoc
......@@ -413,7 +413,7 @@ endif()
# Then link directories is set as target property below.
link_directories(${COMISO_LINK_DIRECTORIES})
acg_add_library (CoMISo SHARED ${ui} ${sources} ${headers} )
vci_add_library (CoMISo SHARED ${ui} ${sources} ${headers} )
add_library(CoMISo::CoMISo ALIAS CoMISo)
target_include_directories(CoMISo
......@@ -469,11 +469,11 @@ endif()
if ( QT5_FOUND )
if ( NOT WIN32 )
# Allow targets depending on ACG find the autogenerated header files
# Allow targets depending on VCI find the autogenerated header files
#target_include_directories( CoMISo PUBLIC
# ${CMAKE_CURRENT_BINARY_DIR}/CoMISo_autogen/include )
else()
# Allow targets depending on ACG find the autogenerated header files
# Allow targets depending on VCI find the autogenerated header files
#target_include_directories( CoMISo PUBLIC
# $<$<CONFIG:Debug>:${CMAKE_CURRENT_BINARY_DIR}/CoMISo_autogen/include_Debug/>
# $<$<CONFIG:Release>:${CMAKE_CURRENT_BINARY_DIR}/CoMISo_autogen/include_Release/> )
......@@ -498,7 +498,7 @@ endif()
set_target_properties(CoMISo PROPERTIES INSTALL_RPATH_USE_LINK_PATH 1)
# display results
acg_print_configure_header (COMISO "CoMISo")
vci_print_configure_header (COMISO "CoMISo")
# write config file
configure_file ("${CMAKE_CURRENT_SOURCE_DIR}/Config/config.hh.in"
......
include (CoMISoExample)
acg_add_executable (factored_solver ${sources} ${headers} )
vci_add_executable (factored_solver ${sources} ${headers} )
# enable rpath linking
set_target_properties(factored_solver PROPERTIES INSTALL_RPATH_USE_LINK_PATH 1)
......
include (CoMISoExample)
acg_add_executable (quadratic_solver ${sources} ${headers} )
vci_add_executable (quadratic_solver ${sources} ${headers} )
# enable rpath linking
set_target_properties(quadratic_solver PROPERTIES INSTALL_RPATH_USE_LINK_PATH 1)
......
include (CoMISoExample)
acg_add_executable (small_AQP ${sources} ${headers} )
vci_add_executable (small_AQP ${sources} ${headers} )
# enable rpath linking
set_target_properties(small_AQP PROPERTIES INSTALL_RPATH_USE_LINK_PATH 1)
......
include (CoMISoExample)
acg_add_executable (small_adolc ${sources} ${headers} )
vci_add_executable (small_adolc ${sources} ${headers} )
# enable rpath linking
set_target_properties(small_adolc PROPERTIES INSTALL_RPATH_USE_LINK_PATH 1)
......
include (CoMISoExample)
acg_add_executable (small_cplex_soc ${sources} ${headers} )
vci_add_executable (small_cplex_soc ${sources} ${headers} )
# enable rpath linking
......
include (CoMISoExample)
acg_add_executable (small_eigenproblem ${sources} ${headers} )
vci_add_executable (small_eigenproblem ${sources} ${headers} )
# enable rpath linking
set_target_properties(small_eigenproblem PROPERTIES INSTALL_RPATH_USE_LINK_PATH 1)
......
include (CoMISoExample)
acg_add_executable (small_exact_constraint_satifaction_example ${sources} ${headers} )
vci_add_executable (small_exact_constraint_satifaction_example ${sources} ${headers} )
# enable rpath linking
set_target_properties(small_exact_constraint_satifaction_example PROPERTIES INSTALL_RPATH_USE_LINK_PATH 1)
......
include (CoMISoExample)
acg_add_executable (small_factored_solver ${sources} ${headers} )
vci_add_executable (small_factored_solver ${sources} ${headers} )
# enable rpath linking
set_target_properties(small_factored_solver PROPERTIES INSTALL_RPATH_USE_LINK_PATH 1)
......
include (CoMISoExample)
acg_add_executable (small_finite_element ${sources} ${headers} )
vci_add_executable (small_finite_element ${sources} ${headers} )
# enable rpath linking
set_target_properties(small_finite_element PROPERTIES INSTALL_RPATH_USE_LINK_PATH 1)
......
include (CoMISoExample)
acg_add_executable (small_linear_problem ${sources} ${headers} )
vci_add_executable (small_linear_problem ${sources} ${headers} )
# enable rpath linking
set_target_properties(small_linear_problem PROPERTIES INSTALL_RPATH_USE_LINK_PATH 1)
......
include (CoMISoExample)
acg_add_executable (small_miqp ${sources} ${headers} )
vci_add_executable (small_miqp ${sources} ${headers} )
# enable rpath linking
set_target_properties(small_miqp PROPERTIES INSTALL_RPATH_USE_LINK_PATH 1)
......
include (CoMISoExample)
acg_add_executable (small_nleast_squares ${sources} ${headers} )
vci_add_executable (small_nleast_squares ${sources} ${headers} )
# enable rpath linking
set_target_properties(small_nleast_squares PROPERTIES INSTALL_RPATH_USE_LINK_PATH 1)
......
include (CoMISoExample)
acg_add_executable (small_nsolver ${sources} ${headers} )
vci_add_executable (small_nsolver ${sources} ${headers} )
# enable rpath linking
set_target_properties(small_nsolver PROPERTIES INSTALL_RPATH_USE_LINK_PATH 1)
......
include (CoMISoExample)
acg_add_executable (small_quadratic_solver ${sources} ${headers} )
vci_add_executable (small_quadratic_solver ${sources} ${headers} )
# enable rpath linking
set_target_properties(small_quadratic_solver PROPERTIES INSTALL_RPATH_USE_LINK_PATH 1)
......
include (CoMISoExample)
acg_add_executable (small_quadratic_resolve ${sources} ${headers} )
vci_add_executable (small_quadratic_resolve ${sources} ${headers} )
# enable rpath linking
set_target_properties(small_quadratic_resolve PROPERTIES INSTALL_RPATH_USE_LINK_PATH 1)
......
include (CoMISoExample)
acg_add_executable (small_sparseqr ${sources} ${headers} )
vci_add_executable (small_sparseqr ${sources} ${headers} )
# enable rpath linking
set_target_properties(small_sparseqr PROPERTIES INSTALL_RPATH_USE_LINK_PATH 1)
......
include (CoMISoExample)
acg_add_executable (small_symmetric_dirichlet ${sources} ${headers} )
vci_add_executable (small_symmetric_dirichlet ${sources} ${headers} )
# enable rpath linking
set_target_properties(small_symmetric_dirichlet PROPERTIES INSTALL_RPATH_USE_LINK_PATH 1)
......
Subproject commit 408906cf7d0708eb88265d7717eac097439847f9
Subproject commit a49385233272aa9a98c626c6adc5ba213ab2c811
# add our macro directory to cmake search path
set (CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake)
include (ACGCommon)
include (VCICommon)
find_package(CoMISo)
#find_package(MUMPS)
......@@ -157,8 +157,8 @@ set (directories
# collect all header and source files
set(headers "")
set(sources "")
acg_append_files (headers "*.hh" ${directories})
acg_append_files (sources "*.cc" ${directories})
vci_append_files (headers "*.hh" ${directories})
vci_append_files (sources "*.cc" ${directories})
# remove template cc files from source file list
acg_drop_templates (sources)
vci_drop_templates (sources)
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