Changeset 13570


Ignore:
Timestamp:
Sep 21, 2019 11:41:25 AM (3 months ago)
Author:
Christian Andersson
Message:

Fixed so that libs are not unnecessary copied. Related to ticket:5837

Location:
branches/dev-cw-evaluator/RuntimeLibrary
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • branches/dev-cw-evaluator/RuntimeLibrary/CMakeLists.txt

    r13478 r13570  
    6060    set(RTLIB_BIN_DIR ${JMODELICA_INSTALL_DIR}/bin)
    6161endif()
    62 if(MSVC)
    63     set(RTLIB_BIN_DIR ${RTLIB_BIN_DIR}/msvs)
    64 endif()
    6562install(CODE "file(MAKE_DIRECTORY $ENV{DESTDIR}${RTLIB_LIB_DIR})")
    6663
  • branches/dev-cw-evaluator/RuntimeLibrary/src/evaluator/CMakeLists.txt

    r13534 r13570  
    5555
    5656#Install the libraries
    57 install(TARGETS jmi_evaluator DESTINATION "${RTLIB_BIN_DIR}")
    58 install(TARGETS jmi_evaluator_util DESTINATION "${RTLIB_LIB_DIR}")
     57if (NOT MSVC)
     58    install(TARGETS jmi_evaluator DESTINATION "${RTLIB_BIN_DIR}")
     59    install(TARGETS jmi_evaluator_util DESTINATION "${RTLIB_LIB_DIR}")
     60endif()
    5961
    6062#Install header files
  • branches/dev-cw-evaluator/RuntimeLibrary/src/fmi1_cs/CMakeLists.txt

    r6737 r13570  
    3737
    3838#Install the libraries
    39 install(TARGETS fmi1_cs DESTINATION "${RTLIB_LIB_DIR}")
     39if (NOT MSVC)
     40    install(TARGETS fmi1_cs DESTINATION "${RTLIB_LIB_DIR}")
     41endif()
    4042
    4143#Install header files
  • branches/dev-cw-evaluator/RuntimeLibrary/src/fmi1_me/CMakeLists.txt

    r6737 r13570  
    3939
    4040#Install the libraries
    41 install(TARGETS fmi1_me DESTINATION "${RTLIB_LIB_DIR}")
     41if (NOT MSVC)
     42    install(TARGETS fmi1_me DESTINATION "${RTLIB_LIB_DIR}")
     43endif()
    4244
    4345#Install header files
  • branches/dev-cw-evaluator/RuntimeLibrary/src/fmi2/CMakeLists.txt

    r6737 r13570  
    4949
    5050#Install the libraries
    51 install(TARGETS fmi2 DESTINATION "${RTLIB_LIB_DIR}")
     51if (NOT MSVC)
     52    install(TARGETS fmi2 DESTINATION "${RTLIB_LIB_DIR}")
     53endif()
    5254
    5355#Install header files
  • branches/dev-cw-evaluator/RuntimeLibrary/src/jmi/CMakeLists.txt

    r12148 r13570  
    202202
    203203    #Install the libraries
    204     install(TARGETS jmi
    205         DESTINATION "${RTLIB_LIB_DIR}")
     204    if (NOT MSVC)
     205        install(TARGETS jmi
     206            DESTINATION "${RTLIB_LIB_DIR}")
     207    endif()
    206208
    207209    #Install header files
     
    247249
    248250    #Install the libraries
    249     install(TARGETS ModelicaExternalC ModelicaStandardTables ModelicaIO ModelicaMatIO zlib
    250         DESTINATION "${RTLIB_LIB_DIR}")
     251    if (NOT MSVC)
     252        install(TARGETS ModelicaExternalC ModelicaStandardTables ModelicaIO ModelicaMatIO zlib
     253            DESTINATION "${RTLIB_LIB_DIR}")
     254    endif()
    251255
    252256    install(DIRECTORY "${MSLCSOURCES}/"
Note: See TracChangeset for help on using the changeset viewer.