Context Navigation

CMakeLists.txt

Timestamp:

Oct 22, 2019 11:31:16 AM (8 weeks ago)

Author:

randersson

Message:

#5819 Merged trunk into branch

Location:

branches/dev-5819

Files:

Property svn:mergeinfo changed

/branches/dev-1247-jw (added)	merged: 13653,13773,13784
/branches/dev-1247-jw-merge (added)	merged: 13787
/branches/dev-cw-evaluator (added)	merged: 13435-13437,13440,13445-13446,13448-13449,13460,13465,13478-13482,13533-13534,13538,13542,13548-13550,13553,13562,13570,13572-13573,13602,13610,13629-13633,13639,13646-13647,13659,13705,13712
/branches/dev-cw-pyfmi (added)	merged: 13734-13736
/branches/dev-jk-2471-2 (added)	merged: 13708-13709,13722-13723
/branches/dev-mo-2265 (added)	merged: 13673-13674,13676,13681,13686,13695-13696,13711
/trunk	merged: 13670,13675,13677,13679,13700,13703,13719-13720,13730,13732,13739,13756,13758,13781,13789-13790,13793,13798

Property svn:mergeinfo changed

/branches/dev-cw-evaluator/RuntimeLibrary/src (added)	merged: 13436,13440,13465,13534,13548,13553,13562,13570,13572-13573,13602,13712
/trunk/RuntimeLibrary/src	merged: 13700,13703,13719

-                      r12148
+                      r13800
     #Install the libraries
+    install(TARGETS jmi
+        DESTINATION "${RTLIB_LIB_DIR}")
+    if (NOT MSVC)
+        install(TARGETS jmi
+            DESTINATION "${RTLIB_LIB_DIR}")
+    endif()
     #Install header files
 …
     #Install the libraries
+    install(TARGETS ModelicaExternalC ModelicaStandardTables ModelicaIO ModelicaMatIO zlib
+        DESTINATION "${RTLIB_LIB_DIR}")
+    if (NOT MSVC)
+        install(TARGETS ModelicaExternalC ModelicaStandardTables ModelicaIO ModelicaMatIO zlib
+            DESTINATION "${RTLIB_LIB_DIR}")
+    endif()
     install(DIRECTORY "${MSLCSOURCES}/"

Note: See TracChangeset for help on using the changeset viewer.