Commit a33af77a authored by fmg005's avatar fmg005

updated the prosim.cmake

parent 985859b5
...@@ -43,7 +43,6 @@ set(libconfig++_INCLUDE_DIR ${install_dir}/include) ...@@ -43,7 +43,6 @@ set(libconfig++_INCLUDE_DIR ${install_dir}/include)
#prosim depends on pulse this will call will give you access to pulse directories #prosim depends on pulse this will call will give you access to pulse directories
#needed by prosim #needed by prosim
find_package(Pulse REQUIRED NO_MODULE) find_package(Pulse REQUIRED NO_MODULE)
add_subdirectory(lib)
set(PROSIM_CONFIG_DIR ${CMAKE_CURRENT_SOURCE_DIR}/resources/) set(PROSIM_CONFIG_DIR ${CMAKE_CURRENT_SOURCE_DIR}/resources/)
set(PROSIM_RESULTS_DIR ${CMAKE_CURRENT_SOURCE_DIR}/results/) set(PROSIM_RESULTS_DIR ${CMAKE_CURRENT_SOURCE_DIR}/results/)
...@@ -58,7 +57,6 @@ configure_file( ...@@ -58,7 +57,6 @@ configure_file(
${CMAKE_CURRENT_SOURCE_DIR}/include/configure_prosim_paths.h ${CMAKE_CURRENT_SOURCE_DIR}/include/configure_prosim_paths.h
) )
set( my_srcs set( my_srcs
HardwareSimulator.cpp
CLA_Logger.cpp CLA_Logger.cpp
SimulationEngine.cpp SimulationEngine.cpp
Timer.cpp Timer.cpp
...@@ -71,8 +69,6 @@ set( my_srcs ...@@ -71,8 +69,6 @@ set( my_srcs
PatientOut.cpp PatientOut.cpp
) )
find_library(PROSIM_LIB libprosim PATHS "${CMAKE_CURRENT_SOURCE_DIR}/lib")
add_executable(prosim ${my_srcs}) add_executable(prosim ${my_srcs})
#include directories #include directories
...@@ -89,7 +85,6 @@ target_link_libraries(prosim optimized ...@@ -89,7 +85,6 @@ target_link_libraries(prosim optimized
${Pulse_LIBS} ${Pulse_LIBS}
libconfig++ libconfig++
libserial libserial
libprosim ${CMAKE_CURRENT_SOURCE_DIR}/lib/liblibprosim.a)
${PROSIM_LIB})
install(TARGETS prosim DESTINATION ${Pulse_INSTALL}/bin) install(TARGETS prosim DESTINATION ${Pulse_INSTALL}/bin)
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment