diff options
| author | Alexey Ushakov <Alexey.Ushakov@jetbrains.com> | 2016-08-15 15:32:53 +0300 |
|---|---|---|
| committer | Alexey Ushakov <Alexey.Ushakov@jetbrains.com> | 2016-08-15 15:35:12 +0300 |
| commit | 3c84287b17bdc9b34ab471e8c54992c1b5bd8e62 (patch) | |
| tree | 9d714fb8b35c0c7971390d549f17879c54b2cd6a /idea | |
| parent | d00e032b1e0e795cd1c8e89c7f0d29b61dd07faf (diff) | |
| download | jdk8u_jdk-3c84287b17bdc9b34ab471e8c54992c1b5bd8e62.tar.gz | |
Updated cmake project for jdk on OSX and Linux
Diffstat (limited to 'idea')
| -rw-r--r-- | idea/native/CMakeLists.txt | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/idea/native/CMakeLists.txt b/idea/native/CMakeLists.txt index 24bb891a8f..e65f4d86a5 100644 --- a/idea/native/CMakeLists.txt +++ b/idea/native/CMakeLists.txt @@ -1,9 +1,25 @@ cmake_minimum_required(VERSION 3.4) project(jdk) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") -include_directories(../../src/share/javavm/export ../../src/share/native/common ../../src/solaris/javavm/export ../../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers/) +include_directories( + ../../src/share/javavm/export + ../../src/share/native/common + ../../src/share/native/sun/font + ../../src/share/native/sun/java2d) + +if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") + include_directories( + ../../src/solaris/native/common + ../../src/solaris/javavm/export + ../../../build/macosx-x86_64-normal-server-release/jdk/gensrc_headers) +elseif(${CMAKE_SYSTEM_NAME} MATCHES "Linux") + include_directories( + ../../src/solaris/native/common + ../../src/solaris/javavm/export + ../../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers) +endif() + find_package(Freetype REQUIRED) include_directories(${FREETYPE_INCLUDE_DIRS}) |