X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=CMakeLists.txt;h=0519f2809f7f91bcad49c8e1080c2a9eff0e1d8b;hb=HEAD;hp=be8526d4b46b6ce23dea5cafe20b7d6792d78b05;hpb=4249e1abd767b5cbbe9b722710b90ed49cd0390a;p=junction.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index be8526d..0519f28 100644
--- 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)")
@@ -29,7 +35,8 @@ set(JUNCTION_ALL_DLLS "")
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules")
 
 # Add turf targets and import its macros since we use them below
-find_package(Turf REQUIRED)
+get_filename_component(outerPath "${CMAKE_CURRENT_LIST_DIR}/.." ABSOLUTE)
+set(TURF_ROOT "${outerPath}/turf" CACHE STRING "Path to Turf")
 include("${TURF_ROOT}/cmake/Macros.cmake")
 if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
     # If this is the root project, apply build settings here so that
@@ -133,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)
+