Commit e8fd683923cc64e1ac7282f6a3ea937cd0f4468e
1 parent
8d8c3ebd
minor name changes and Linux fixes - still not compiling on CUDA 7.5
Showing
2 changed files
with
15 additions
and
6 deletions
Show diff stats
CMakeLists.txt
| 1 | 1 | #Specify the version being used aswell as the language |
| 2 | 2 | cmake_minimum_required(VERSION 2.8) |
| 3 | 3 | #Name your project here |
| 4 | -project(bimsym) | |
| 5 | - | |
| 6 | - | |
| 4 | +project(bimsim) | |
| 7 | 5 | |
| 8 | 6 | #set the module directory |
| 9 | 7 | set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}") |
| ... | ... | @@ -23,7 +21,18 @@ find_package(STIM) |
| 23 | 21 | if ( MSVC ) |
| 24 | 22 | SET( CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG "${OUTPUT_DIRECTORY}") |
| 25 | 23 | SET( CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE "${OUTPUT_DIRECTORY}") |
| 24 | + SET( LIBRARY_OUTPUT_DIRECTORY_DEBUG "${OUTPUT_DIRECTORY}") | |
| 25 | + SET( LIBRARY_OUTPUT_DIRECTORY_RELEASE "${OUTPUT_DIRECTORY}") | |
| 26 | + add_definitions(-D_CRT_SECURE_NO_WARNINGS) | |
| 27 | + add_definitions(-D_SCL_SECURE_NO_WARNINGS) | |
| 26 | 28 | endif ( MSVC ) |
| 29 | +#MAYBE REMOVE----------------- | |
| 30 | +#set C++11 flags if using GCC | |
| 31 | +if( CMAKE_COMPILER_IS_GNUCC ) | |
| 32 | + SET( CMAKE_CXX_FLAGS "-std=c++11") | |
| 33 | + SET( CUDA_NVCC_FLAGS "-std=c++11") | |
| 34 | +endif( CMAKE_COMPILER_IS_GNUCC ) | |
| 35 | +#----------------------------- | |
| 27 | 36 | |
| 28 | 37 | #set the include directories |
| 29 | 38 | include_directories( |
| ... | ... | @@ -36,13 +45,13 @@ include_directories( |
| 36 | 45 | #SET(CUDA_NVCC_FLAGS_RELEASE ${CUDA_NVCC_FLAGS};/maxregcount=60) |
| 37 | 46 | |
| 38 | 47 | #create an executable |
| 39 | -cuda_add_executable(bimsym | |
| 40 | - bimsym.cu | |
| 48 | +cuda_add_executable(bimsim | |
| 49 | + bimsim.cu | |
| 41 | 50 | sources.h |
| 42 | 51 | ) |
| 43 | 52 | |
| 44 | 53 | #set the link libraries |
| 45 | -target_link_libraries(bimsym | |
| 54 | +target_link_libraries(bimsim | |
| 46 | 55 | ${CUDA_cufft_LIBRARY} |
| 47 | 56 | ${CUDA_cublas_LIBRARY} |
| 48 | 57 | ${OpenCV_LIBS} | ... | ... |
bimsym.cu renamed to bimsim.cu