diff options
| author | Stefan Radomski <radomski@tk.informatik.tu-darmstadt.de> | 2013-06-21 19:31:25 (GMT) |
|---|---|---|
| committer | Stefan Radomski <radomski@tk.informatik.tu-darmstadt.de> | 2013-06-21 19:31:25 (GMT) |
| commit | 0192f99e8ad75bab4041cca11d94d32503cc9666 (patch) | |
| tree | dcf1e28be714f244f61406a18261c9f2cceaf2a9 /CMakeLists.txt | |
| parent | 8e3cca4a153a5178a77ae6956292606563f4b8fe (diff) | |
| download | uscxml-0192f99e8ad75bab4041cca11d94d32503cc9666.zip uscxml-0192f99e8ad75bab4041cca11d94d32503cc9666.tar.gz uscxml-0192f99e8ad75bab4041cca11d94d32503cc9666.tar.bz2 | |
More complete JSC ECMA datamodel
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 70d8a88..938e8ba 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -278,7 +278,7 @@ set(CMAKE_COMPILER_STRING "${CMAKE_CXX_COMPILER_ID} ${CMAKE_CXX_COMPILER_VERSION # see http://www.mail-archive.com/cmake@cmake.org/msg23240.html if (APPLE) # add_definitions("-D_DARWIN_UNLIMITED_SELECT") - set(CMAKE_OSX_ARCHITECTURES "x86_64;i386") +# set(CMAKE_OSX_ARCHITECTURES "x86_64;i386") # support leopard and above set(CMAKE_OSX_DEPLOYMENT_TARGET 10.6) foreach(FLAGS CMAKE_C_FLAGS CMAKE_CXX_FLAGS CMAKE_EXE_LINKER_FLAGS CMAKE_SHARED_LINKER_FLAGS CMAKE_MODULE_LINKER_FLAGS) @@ -454,13 +454,14 @@ if (APPLE OR IOS) list (APPEND USCXML_CORE_LIBS ${JSC_LIBRARY}) endif() set(JSC_FOUND ON) +else() + find_package(V8) + if (V8_FOUND) + include_directories(${V8_INCLUDE_DIR}) + list (APPEND USCXML_OPT_LIBS ${V8_LIBRARY}) + endif() endif() -find_package(V8) -if (V8_FOUND) - include_directories(${V8_INCLUDE_DIR}) - list (APPEND USCXML_OPT_LIBS ${V8_LIBRARY}) -endif() set(CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES_SHARED}) find_package(SWI) |