codeaudit
diff --git a/‎examples/CMakeLists.txt‎
Lines changed: 11 additions & 8 deletions b/‎examples/CMakeLists.txt‎
Lines changed: 11 additions & 8 deletions
diff --git a/‎examples/pi.cpp‎ ‎examples/benchmarks/pi.cpp‎examples/pi.cpp renamed to examples/benchmarks/pi.cpp b/‎examples/pi.cpp‎ ‎examples/benchmarks/pi.cpp‎examples/pi.cpp renamed to examples/benchmarks/pi.cpp
diff --git a/‎examples/vectorize.cpp‎ ‎examples/getting_started/vectorize.cpp‎examples/vectorize.cpp renamed to examples/getting_started/vectorize.cpp b/‎examples/vectorize.cpp‎ ‎examples/getting_started/vectorize.cpp‎examples/vectorize.cpp renamed to examples/getting_started/vectorize.cpp
diff --git a/‎examples/helloworld.cpp‎ ‎examples/helloworld/helloworld.cpp‎examples/helloworld.cpp renamed to examples/helloworld/helloworld.cpp b/‎examples/helloworld.cpp‎ ‎examples/helloworld/helloworld.cpp‎examples/helloworld.cpp renamed to examples/helloworld/helloworld.cpp
@@ -1,19 +1,22 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
 
-FILE(GLOB FILES "*.cpp")
+FILE(GLOB FILES "*/*.cpp")
 
 MACRO(CREATE_EXAMPLES BACKEND)
     STRING(TOUPPER ${BACKEND} DEF_NAME)
     FOREACH(FILE ${FILES})
-        GET_FILENAME_COMPONENT(FNAME ${FILE} NAME_WE)
-        SET(EXAMPLE_NAME example_${FNAME}_${BACKEND})
+        GET_FILENAME_COMPONENT(EXAMPLE ${FILE} NAME_WE)
+        GET_FILENAME_COMPONENT(FULL_DIR_NAME ${FILE} DIRECTORY)
+        GET_FILENAME_COMPONENT(DIR_NAME ${FULL_DIR_NAME} NAME)
+        SET(EXAMPLE_NAME example_${DIR_NAME}_${EXAMPLE}_${BACKEND})
 
-        #ADD_EXAMPLE(Test_${EXAMPLE_NAME} ${EXAMPLE_NAME})
-        ADD_EXECUTABLE(${EXAMPLE_NAME} ${FNAME}.cpp)
+        ADD_EXECUTABLE(${EXAMPLE_NAME} ${FILE})
         TARGET_LINK_LIBRARIES(${EXAMPLE_NAME} af${BACKEND} ${THREAD_LIB_FLAG})
-        SET_TARGET_PROPERTIES(${EXAMPLE_NAME} PROPERTIES COMPILE_FLAGS -DAF_${DEF_NAME} OUTPUT_NAME ${FNAME}_${BACKEND})
-
-#        INSTALL(TARGETS ${EXAMPLE_NAME} DESTINATION arrayfire/examples)
+        SET_TARGET_PROPERTIES(${EXAMPLE_NAME}
+                               PROPERTIES
+                               COMPILE_FLAGS -DAF_${DEF_NAME}
+                               OUTPUT_NAME ${EXAMPLE}_${BACKEND}
+                               RUNTIME_OUTPUT_DIRECTORY ${DIR_NAME})
      ENDFOREACH()
 ENDMACRO(CREATE_EXAMPLES)