diff --git a/CMakeLists.txt b/CMakeLists.txt
index d8c5070..422f3f2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,6 +1,8 @@
 cmake_minimum_required(VERSION 2.8.4)
 project("daysim")
 
+add_definitions(-DDAYSIM)
+
 if(NOT ${CMAKE_VERSION} VERSION_LESS "2.8.11")
   cmake_policy(SET CMP0020 NEW)
   if(NOT ${CMAKE_VERSION} VERSION_LESS "3.0")
@@ -61,7 +63,8 @@ endif()
 
 if(UNIX)
   set(CPACK_PACKAGING_INSTALL_PREFIX "/usr/local/daysim")
-  add_definitions(-Dlinux -D_FILE_OFFSET_BITS=64 -DNOSTEREO)
+  add_definitions( -Dlinux -D_FILE_OFFSET_BITS=64 -DNOSTEREO )
+  set(CMAKE_CXX_FLAGS "-std=c++11")
 else()
   set(CPACK_PACKAGING_INSTALL_PREFIX "/")
 endif()
diff --git a/src/daysim/CMakeLists.txt b/src/daysim/CMakeLists.txt
index 102b4f6..6f1d4b9 100755
--- a/src/daysim/CMakeLists.txt
+++ b/src/daysim/CMakeLists.txt
@@ -8,7 +8,7 @@ add_library(daysim_common fropen.c parse.c read_in_header.c nrutil.c numerical.c
 add_executable(gen_reindl gen_reindl.c)
 target_link_libraries(gen_reindl daysim_common rtrad)
 
-add_executable(gencumulativesky gendiscretesky.cpp climateFile.cpp cPerezSkyModel.cpp cSkyVault.cpp cSun.cpp)
+add_executable( gencumulativesky gendiscretesky.cpp climateFile.cpp cPerezSkyModel.cpp cSkyVault.cpp cSun.cpp)
 target_link_libraries(gencumulativesky daysim_common rtrad)
 
 add_executable(ds_el_lighting ds_el_lighting.c allocate_memory.c analysis_data.c daylightfactor.c get_illuminances.c lightswitch.c simulation_assumptions.c BlindModel.c occ_func.c)
diff --git a/src/util/CMakeLists.txt b/src/util/CMakeLists.txt
index 92ac153..81b5015 100644
--- a/src/util/CMakeLists.txt
+++ b/src/util/CMakeLists.txt
@@ -161,7 +161,7 @@ if(WIN32)
     DESTINATION "bin"
   )
 else()
-  install_without_extension(
+	install(PROGRAMS
     bsdfview.pl
     compamb.csh
     dayfact.csh
@@ -180,5 +180,6 @@ else()
     rlux.csh
     trad.wsh
     vinfo.csh
+    DESTINATION "bin"
   )
 endif()