Skip to content
Snippets Groups Projects
Commit 87717570 authored by Alexis Girault's avatar Alexis Girault
Browse files

COMP: fix compilation issues on Linux

- Remove PThreads on Linux
- Correct CMake output directories in case of single
configuration type (not MSVC)
parent cd448a23
No related branches found
No related tags found
No related merge requests found
......@@ -8,6 +8,9 @@ imstk_add_library( Core
imstkModule.h
CPP_FILES
imstkModule.cpp
LIBRARIES
Utilities
Eigen
)
#-----------------------------------------------------------------------------
......
......@@ -17,7 +17,6 @@ imstk_add_library( Rendering
imstkCubeRenderDelegate.cpp
LIBRARIES
${VTK_LIBRARIES}
Core
Scene
)
......
......@@ -10,7 +10,6 @@ imstk_add_library( SimulationManager
LIBRARIES
Scene
Rendering
Utilities
)
#-----------------------------------------------------------------------------
......
......@@ -37,13 +37,13 @@ if(NOT CMAKE_CONFIGURATION_TYPES)
# If we're not doing multi-configuration, just set the three main
# variables to the correct values.
if(NOT CMAKE_LIBRARY_OUTPUT_DIRECTORY)
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKES_BINARY_DIR}/${LIB_DIR})
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${LIB_DIR})
endif()
if(NOT CMAKE_ARCHIVE_OUTPUT_DIRECTORY)
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKES_BINARY_DIR}/${LIB_DIR})
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${LIB_DIR})
endif()
if(NOT CMAKE_RUNTIME_OUTPUT_DIRECTORY)
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKES_BINARY_DIR}/${BIN_DIR})
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${BIN_DIR})
endif()
list(APPEND CMAKE_OUTPUT_DIRECTORIES
-DCMAKE_RUNTIME_OUTPUT_DIRECTORY:STRING=${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
......
......@@ -71,11 +71,14 @@ if(${PROJECT_NAME}_USE_Uncrustify)
imstk_define_dependency(Uncrustify)
endif()
if(WIN32)
imstk_define_dependency(PThreads)
endif()
imstk_define_dependency(g3log)
imstk_define_dependency(Eigen)
imstk_define_dependency(VegaFEM)
imstk_define_dependency(VTK)
imstk_define_dependency(PThreads)
#-----------------------------------------------------------------------------
# SUPERBUILD
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment