Skip to content
Permalink
Browse files

Merge pull request #450 from UniStuttgart-VISUS/openmp_fix_2

Fixed options
  • Loading branch information...
tobiasrau committed Sep 10, 2019
2 parents 3c630e9 + 252f51a commit e7a3fcbee69f2190048a74078dd9e6f21220ce42
Showing with 5 additions and 5 deletions.
  1. +3 −3 cmake/megamol_options.cmake
  2. +1 −1 plugins/molecularmaps/CMakeLists.txt
  3. +1 −1 plugins/protein_cuda/CMakeLists.txt
@@ -9,7 +9,7 @@ else()
endif()

# Build types
set(CMAKE_CONFIGURATION_TYPES "Debug;Release;RelWithDebInfo")
set(CMAKE_CONFIGURATION_TYPES CACHE STRING "Debug;Release;RelWithDebInfo" FORCE)
if(NOT CMAKE_BUILD_TYPE)
set(CMAKE_BUILD_TYPE "Release" CACHE STRING "Choose the build type." FORCE)
endif()
@@ -72,8 +72,8 @@ if(UNIX)
find_package(OpenMP)
endif()
if(OPENMP_FOUND OR WIN32)
list(APPEND CMAKE_C_FLAGS ${OpenMP_C_FLAGS})
list(APPEND CMAKE_CXX_FLAGS ${OpenMP_CXX_FLAGS})
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}")
endif()

# OpenGL
@@ -49,7 +49,7 @@ if(BUILD_${EXPORT_NAME}_PLUGIN)

# Target definition
add_library(${PROJECT_NAME} SHARED ${public_header_files} ${header_files} ${shader_files} ${source_files} ${cuda_header_files} ${cuda_source_files})
set_target_properties(${PROJECT_NAME} PROPERTIES SUFFIX ".mmplg")
set_target_properties(${PROJECT_NAME} PROPERTIES SUFFIX ".mmplg" CUDA_STANDARD 14)
target_compile_definitions(${PROJECT_NAME} PRIVATE ${EXPORT_NAME}_EXPORTS)
target_include_directories(${PROJECT_NAME} PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> "include" "src" "src/helper_includes")
target_link_libraries(${PROJECT_NAME} PRIVATE vislib core glad protein_calls geometry_calls Eigen)
@@ -57,7 +57,7 @@ if(BUILD_${EXPORT_NAME}_PLUGIN)

# Target definition
add_library(${PROJECT_NAME} SHARED ${public_header_files} ${header_files} ${shader_files} ${source_files} ${cuda_header_files} ${cuda_source_files} ${cuda_helpers})
set_target_properties(${PROJECT_NAME} PROPERTIES SUFFIX ".mmplg")
set_target_properties(${PROJECT_NAME} PROPERTIES SUFFIX ".mmplg" CUDA_STANDARD 14)
target_compile_definitions(${PROJECT_NAME} PRIVATE ${EXPORT_NAME}_EXPORTS)
target_include_directories(${PROJECT_NAME} PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
"include" "src" "src/helper_includes" "${CUDA_BIN_DIR}/../include")

0 comments on commit e7a3fcb

Please sign in to comment.
You can’t perform that action at this time.