Adds parallel test case organization in CMakefile (no actual parallel test cases...

[junction.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 93cf495de51c5b16630515332694455c1a4bb503..0519f2809f7f91bcad49c8e1080c2a9eff0e1d8b 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,15 +1,21 @@
 cmake_minimum_required(VERSION 2.8.5)
 
+#SET(CMAKE_C_COMPILER clang-native)
+#SET(CMAKE_CXX_COMPILER clang++-native)
+SET(CMAKE_C_COMPILER clang-cross)
+SET(CMAKE_CXX_COMPILER clang++-cross)
+
 if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
        # If this is the root project, issue a project() command so that
        # the Visual Studio generator will create an .sln file.
-    set(CMAKE_CONFIGURATION_TYPES "Debug;RelWithAsserts;RelWithDebInfo" CACHE INTERNAL "Build configs")
+    #set(CMAKE_CONFIGURATION_TYPES "Debug;RelWithAsserts;RelWithDebInfo" CACHE INTERNAL "Build configs")
+    set(CMAKE_CONFIGURATION_TYPES "Release" CACHE INTERNAL "Build configs")
        project(Junction)
     set_property(GLOBAL PROPERTY USE_FOLDERS ON)
     set(JUNCTION_WITH_SAMPLES TRUE CACHE BOOL "Include all Junction samples in generated build system")
     set(JUNCTION_MAKE_INSTALLABLE TRUE)
     set(TURF_MAKE_INSTALLABLE TRUE)
-endif()        
+endif()
 
 # Default values, can be overridden by user
 set(JUNCTION_USERCONFIG "" CACHE STRING "Optional path to additional config file (relative to root CMakeLists.txt)")
@@ -134,3 +140,5 @@ if(NOT CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
     set(JUNCTION_ALL_DLLS "${JUNCTION_ALL_DLLS}" PARENT_SCOPE)
 endif()
 
+add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/test)
+