- reverted r18640 as it breaks builds and tests.

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@18642 f25d12d1-65f4-0310-ae8a-bbce733d8d8e

SimulationRuntime/cpp/CMakeLists.txt

@@ -7,8 +7,9 @@ SET(ENV{BOOST_ROOT} $ENV{OMDEV}"/lib/3rdParty/boost-1_49/")
 SET(BLAS_blas_LIBRARY $ENV{OMDEV}/lib/3rdParty/Lapack/Lib/blas_win32.dll CACHE FILEPATH "Blas library")
 SET(LAPACK_lapack_LIBRARY  $ENV{OMDEV}/lib/3rdParty/Lapack/Lib/lapack_win32.dll CACHE FILEPATH "Lapack library")
 SET(BLAS_DIRY "$ENV{OMDEV}/lib/3rdParty/Lapack/Lib/" CACHE LOCATION "where was yarp built?")
-SET(ENV{MINPACK_ROOT} ${CMAKE_SOURCE_DIR}"/../../3rdParty/CMinpack/install")
 
+########################################
+# TEST
 FIND_PATH(CMINPACK_INCLUDE_DIR cminpack.h
           HINTS "${CMAKE_SOURCE_DIR}/../../3rdParty/CMinpack/install"
           PATH_SUFFIXES include include/cminpack include/cminpack-1)
@@ -18,11 +19,10 @@ FIND_LIBRARY(CMINPACK_LIBRARY
              HINTS "${CMAKE_SOURCE_DIR}/../../3rdParty/CMinpack/install"
              PATH_SUFFIXES lib lib64)
 
+#include_directories(CMINPACK_INCLUDE_DIR)
+# END TEST
 
-
-message(STATUS "Minpack librarie:")
-message(STATUS ${CMINPACK_INCLUDE_DIR})
-message(STATUS ${CMINPACK_LIBRARY})
+########################################
 
 # Disable Optimization for RelWithDebInfo on Windows
 if (MSVC)
@@ -146,7 +146,6 @@ link_directories ( ${Boost_LIBRARY_DIRS} )
 include_directories (${Boost_INCLUDE_DIR})
 include_directories ("${PROJECT_SOURCE_DIR}")
 include_directories ("${PROJECT_BINARY_DIR}")
-include_directories ("${CMINPACK_INCLUDE_DIR}")
 
 message(STATUS "Boost dirs '${Boost_LIBRARY_DIRS}', '${Boost_INCLUDE_DIR}'")
 

SimulationRuntime/cpp/Solver/Hybrj/CMakeLists.txt

@@ -4,7 +4,7 @@ project(${HybrjName})
 # add the solver default implementation library
 add_library(${HybrjName} SHARED Hybrj.cpp HybrjSettings.cpp FactoryExport.cpp )
 target_link_libraries( ${HybrjName} ${Boost_LIBRARIES})
-target_link_libraries( ${HybrjName} ${LAPACK_LIBRARIES} ${CMINPACK_LIBRARY})
+target_link_libraries( ${HybrjName} ${LAPACK_LIBRARIES} ${MINPACK_LIBRARIES})
 
 
 install (TARGETS ${HybrjName} DESTINATION lib/omc/${LIBINSTALLEXT})