Skip to content

Commit fe0e6fe

Browse files
committed
Updated openmodelica find script.
1 parent e5b1c36 commit fe0e6fe

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
cmake_minimum_required(VERSION 2.8)
22

33
project(modelica3d_dbus CXX C)
4-
option(USE_OMC "use openmodelica" OFF)
4+
option(USE_OMC "use openmodelica" ON)
55
option(OSG_BACKEND "build openscenegraph backed" ON)
66
option(INSTALL_EXAMPLES "install examples" ON)
77
option(BLENDER_BACKEND "build blender backed" ON)

common/cmake/FindOMC.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
# Tries to detect omc modelica-library and include dirs, does not search for binary yet
22

33
# This will also search ${CMAKE_PREFIX_PATH}/include automagically
4-
find_path(OMC_INCLUDE_DIR modelica.h PATH_SUFFIXES omc)
4+
find_path(OMC_INCLUDE_DIR openmodelica.h PATH_SUFFIXES omc/c)
55

66
# This will _not_ search ${CMAKE_PREFIX_PATH}/lib automagically, we need to give a search hint
7-
find_path(OMC_MOD_LIB_DIR "Modelica 3.1/package.mo"
7+
find_path(OMC_MOD_LIB_DIR "ModelicaReference/package.mo"
88
PATHS "${CMAKE_LIBRARY_PATH}/omlibrary"
99
"${CMAKE_PREFIX_PATH}/lib/omlibrary" /usr/lib/omlibrary)
1010

0 commit comments

Comments
 (0)