Commit 60cdbb84 authored by Mccaskey, Alex's avatar Mccaskey, Alex
Browse files

updating version to qcor_version to avoid conflicts 



Signed-off-by: Mccaskey, Alex's avatarAlex McCaskey <mccaskeyaj@ornl.gov>
parent a3436630

runtime/CMakeLists.txt

+3 −3
Original line number Diff line number Diff line 


configure_file("${CMAKE_SOURCE_DIR}/runtime/version.in"

               "${CMAKE_BINARY_DIR}/runtime/version")

install(FILES "${CMAKE_BINARY_DIR}/runtime/version" DESTINATION include/qcor)

configure_file("${CMAKE_SOURCE_DIR}/runtime/qcor_version.in"

               "${CMAKE_BINARY_DIR}/runtime/qcor_version")

install(FILES "${CMAKE_BINARY_DIR}/runtime/qcor_version" DESTINATION include/qcor)



set(LIBRARY_NAME qcor)

runtime/version.in→runtime/qcor_version.in

+0 −0

File moved.

View file

tools/driver/qcor-macosx.in

+2 −2
Original line number Diff line number Diff line
@@ -53,12 +53,12 @@ def main(argv=None): 
        args = parser.parse_args(sys.argv)



    if '-version' in sys.argv[1:]:

        version = open('@CMAKE_INSTALL_PREFIX@/include/qcor/version', 'r').read().rstrip()

        version = open('@CMAKE_INSTALL_PREFIX@/include/qcor/qcor_version', 'r').read().rstrip()

        print('qcor build version = {}'.format(version))

        exit(0)



    if '-xacc-version' in sys.argv[1:]:

        version = open('@XACC_ROOT@/include/xacc/version', 'r').read().rstrip()

        version = open('@XACC_ROOT@/include/xacc/xacc_version', 'r').read().rstrip()

        print('xacc build version = {}'.format(version))

        exit(0)

tools/driver/qcor.in

+2 −2
Original line number Diff line number Diff line
@@ -50,12 +50,12 @@ def main(argv=None): 
        args = parser.parse_args(sys.argv)



    if '-version' in sys.argv[1:]:

        version = open('@CMAKE_INSTALL_PREFIX@/include/qcor/version', 'r').read().rstrip()

        version = open('@CMAKE_INSTALL_PREFIX@/include/qcor/qcor_version', 'r').read().rstrip()

        print('qcor build version = {}'.format(version))

        exit(0)



    if '-xacc-version' in sys.argv[1:]:

        version = open('@XACC_ROOT@/include/xacc/version', 'r').read().rstrip()

        version = open('@XACC_ROOT@/include/xacc/xacc_version', 'r').read().rstrip()

        print('xacc build version = {}'.format(version))

        exit(0)