Skip to content

Commit

Permalink
- CMakeFiles: install omc, libs, docs, testmodels, includes
Browse files Browse the repository at this point in the history
git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@5232 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
  • Loading branch information
Jens Frenkel committed Mar 29, 2010
1 parent 7fdfdab commit 036e41c
Show file tree
Hide file tree
Showing 10 changed files with 33 additions and 12 deletions.
2 changes: 2 additions & 0 deletions CMakeLists.txt
Expand Up @@ -20,6 +20,8 @@ ADD_SUBDIRECTORY(c_runtime)
ADD_SUBDIRECTORY(modelica_parser)
ADD_SUBDIRECTORY(flat_modelica_parser)
ADD_SUBDIRECTORY(Compiler)
ADD_SUBDIRECTORY(doc)
ADD_SUBDIRECTORY(Examples)

# -------------------------------------------------------------
# Models
Expand Down
7 changes: 6 additions & 1 deletion Compiler/CMakeLists.txt
Expand Up @@ -144,6 +144,11 @@ link_directories($ENV{OMDEV}/lib/antlr-win32-msvc $ENV{OMDEV}/lib/mico-win32-msv
#add_definitions(/Ob2 /Ox /O2 /Ot /Oy /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_CRT_SECURE_NO_WARNINGS" /D "_MBCS" /FD /EHsc /MT /W3 /nologo /c /TC /wd4311 /wd4312)
add_definitions(/MT)
ADD_EXECUTABLE(omc ${MOCH_FILES})
TARGET_LINK_LIBRARIES(omc absyn_builder libmodpar mico2313 sendData c_runtime wsock32 shlwapi )
TARGET_LINK_LIBRARIES(omc absyn_builder libmodpar sendData c_runtime wsock32 shlwapi optimized mico2313 debug mico2313d)
TARGET_LINK_LIBRARIES(omc -FORCE:MULTIPLE librml)
add_dependencies(omc ${MOCH_ALL})


# install
INSTALL(TARGETS omc
RUNTIME DESTINATION bin)
6 changes: 0 additions & 6 deletions Compiler/absyn_builder/CMakeLists.txt
Expand Up @@ -115,12 +115,6 @@ SET(helperobjs parse.cpp)

SET(OBJS ${helperobjs} ${ANTLR_OUTPUT} ${ANTLR_WOUTPUT} ${ANTLR_FILES})

IF(WIN32)
SET(ANTLR_LIB antlr)
ELSE(WIN32)
SET(ANTLR_LIB libantlr)
ENDIF(WIN32)
link_directories($ENV{OMDEV}/lib/antlr-win32-msvc)
#add_definitions(/Ob2 /Ox /O2 /Ot /Oy /D "WIN32" /D "NDEBUG" /D "_LIB" /D "_MBCS" /FD /EHsc /MT /GS /Fd"antlr.pdb" /W3 /nologo /c /Zi /TP)
add_definitions(/MT)
ADD_LIBRARY(absyn_builder ${OBJS})
Expand Down
2 changes: 1 addition & 1 deletion Compiler/runtime/CMakeLists.txt
Expand Up @@ -35,5 +35,5 @@ link_directories(${OMCTRUNCHOME}/Compiler/runtime/lpsolve/lib/win32)
#add_definitions(/O2 /Ot /D "WIN32" /D "NDEBUG" /D "_LIB" /D "_MBCS" /FD /EHsc /MT /GS- /W2 /c /TP)
add_definitions(/MT)
ADD_LIBRARY(runtime ${OBJ})
TARGET_LINK_LIBRARIES(runtime lpsolve55)
TARGET_LINK_LIBRARIES(runtime optimized lpsolve55 debug lpsolve55d)
add_dependencies(runtime ${MOCH_ALL})
10 changes: 10 additions & 0 deletions Examples/CMakeLists.txt
@@ -0,0 +1,10 @@

# get all files in directory dir
FILE(GLOB ALL_MO *.mo)
FILE(GLOB ALL_MOS *.mos)
FILE(GLOB ALL_ONB *.onb)
FILE(GLOB ALL_C *.c)
FILE(GLOB ALL_H *.h)

SET(DOCS ${ALL_MO} ${ALL_MOS} ${ALL_ONB} ${ALL_C} ${ALL_H})
INSTALL(FILES ${DOCS} DESTINATION testmodels)
5 changes: 5 additions & 0 deletions c_runtime/CMakeLists.txt
Expand Up @@ -120,3 +120,8 @@ TARGET_LINK_LIBRARIES(c_runtime f2c)
add_definitions(/MT)
ADD_LIBRARY(sim ${sim_sources} ${sim_headers})
TARGET_LINK_LIBRARIES(sim c_runtime f2c)

INSTALL(TARGETS c_runtime sim
ARCHIVE DESTINATION lib)

INSTALL(FILES ${c_runtime_headers} DESTINATION include)
7 changes: 5 additions & 2 deletions c_runtime/libf2c/CMakeLists.txt
Expand Up @@ -68,10 +68,13 @@ set(OFILES ${MISC} ${POW} ${CX} ${DCX} ${REAL} ${DBL} ${INT}
${HALF} ${CMP} ${EFL} ${CHAR} ${I77} ${TIME})
if(WIN32)
ADD_DEFINITIONS(/D_COMPLEX_DEFINED /DUSE_CLOCK /DMSDOS /DNO_ONEXIT /D_MSC_VER /D__STDC__ /D_CRT_SECURE_NO_DEPRECATE /MT)
add_library(f2c ${OFILES} ${f2c_headers})
ELSE(WIN32)
ADD_DEFINITIONS(-fPIC -DNON_UNIX_STDIO)
add_library(f2c ${OFILES} ${f2c_headers})
ENDIF(WIN32)
add_library(f2c ${OFILES} ${f2c_headers})
#set_property(TARGET f2c PROPERTY PREFIX lib)

INSTALL(TARGETS f2c
ARCHIVE DESTINATION lib)
INSTALL(FILES f2c.h DESTINATION include)

2 changes: 2 additions & 0 deletions c_runtime/sendData/CMakeLists.txt
Expand Up @@ -22,3 +22,5 @@ add_definitions(/MT)
ADD_LIBRARY(sendData ${sendData_sources} ${sendData_headers})
TARGET_LINK_LIBRARIES(sendData ${QT_LIBRARIES})

INSTALL(TARGETS sendData
ARCHIVE DESTINATION lib)
2 changes: 1 addition & 1 deletion flat_modelica_parser/src/CMakeLists.txt
Expand Up @@ -100,6 +100,6 @@ link_directories($ENV{OMDEV}/lib/antlr-win32-msvc)
#add_definitions(/Ob2 /Ox /O2 /Ot /Oy /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /EHsc /MT /W3 /nologo /c /TP /wd4311 /wd4312)
add_definitions(/MT)
ADD_LIBRARY(libflat_modelica_parser ${OBJS})
TARGET_LINK_LIBRARIES(libflat_modelica_parser antlr)
TARGET_LINK_LIBRARIES(libflat_modelica_parser optimized antlr debug antlrd)


2 changes: 1 addition & 1 deletion modelica_parser/src/CMakeLists.txt
Expand Up @@ -97,6 +97,6 @@ link_directories($ENV{OMDEV}/lib/antlr-win32-msvc)
#add_definitions(/Ob2 /Ox /O2 /Ot /Oy /D "WIN32" /D "NDEBUG" /D "_LIB" /D "_MBCS" /FD /EHsc /MT /GS /Fd"antlr.pdb" /W3 /nologo /c /Zi /TP)
add_definitions(/MT)
ADD_LIBRARY(libmodelica_parser ${OBJS})
TARGET_LINK_LIBRARIES(libmodelica_parser antlr)
TARGET_LINK_LIBRARIES(libmodelica_parser optimized antlr debug antlrd)


0 comments on commit 036e41c

Please sign in to comment.