minor name changes and Linux fixes - still not compiling on CUDA 7.5

David Mayerich
1 parent 8d8c3ebd
Showing 2 changed files with 15 additions and 6 deletions Show diff stats
CMakeLists.txt
bimsym.cu → bimsim.cu
 #Specify the version being used aswell as the language
 cmake_minimum_required(VERSION 2.8)
 #Name your project here
-project(bimsym)
-
-
+project(bimsim)
 #set the module directory
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}")
@@ -23,7 +21,18 @@ find_package(STIM)
 if ( MSVC )
 	SET( CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG "${OUTPUT_DIRECTORY}")
 	SET( CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE "${OUTPUT_DIRECTORY}")
+	SET( LIBRARY_OUTPUT_DIRECTORY_DEBUG "${OUTPUT_DIRECTORY}")
+	SET( LIBRARY_OUTPUT_DIRECTORY_RELEASE "${OUTPUT_DIRECTORY}")
+	add_definitions(-D_CRT_SECURE_NO_WARNINGS)
+	add_definitions(-D_SCL_SECURE_NO_WARNINGS)
 endif ( MSVC )
+#MAYBE REMOVE-----------------
+#set C++11 flags if using GCC
+if( CMAKE_COMPILER_IS_GNUCC )
+	SET( CMAKE_CXX_FLAGS "-std=c++11")
+	SET( CUDA_NVCC_FLAGS "-std=c++11")
+endif( CMAKE_COMPILER_IS_GNUCC )
+#-----------------------------
 #set the include directories
 include_directories(
@@ -36,13 +45,13 @@ include_directories(
 #SET(CUDA_NVCC_FLAGS_RELEASE ${CUDA_NVCC_FLAGS};/maxregcount=60)
 #create an executable
-cuda_add_executable(bimsym 
-                    bimsym.cu
+cuda_add_executable(bimsim 
+                    bimsim.cu
                     sources.h
 )
 #set the link libraries
-target_link_libraries(bimsym
+target_link_libraries(bimsim
 					  ${CUDA_cufft_LIBRARY}
 					  ${CUDA_cublas_LIBRARY}
 					  ${OpenCV_LIBS}