+26 -10

src/CMakeLists.txt

reviewed

··· 66 66 ${CMAKE_SOURCE_DIR}/platform-include/pthread 67 67 ${CMAKE_CURRENT_SOURCE_DIR}/libc/derived 68 68 ${CMAKE_CURRENT_SOURCE_DIR}/libc/include/NetBSD 69 69 + ${CMAKE_CURRENT_SOURCE_DIR}/libc/include/FreeBSD 69 70 ${CMAKE_CURRENT_SOURCE_DIR}/kernel/libsyscall/wrappers 70 71 ${CMAKE_SOURCE_DIR}/kernel-include 71 72 ${CMAKE_CURRENT_SOURCE_DIR}/duct/include 72 72 - ${CMAKE_CURRENT_SOURCE_DIR}/external/libcxx/include 73 73 - ${CMAKE_CURRENT_SOURCE_DIR}/libm/Source 74 74 - ${CMAKE_CURRENT_SOURCE_DIR}/libc/second-include 73 73 + ${CMAKE_CURRENT_SOURCE_DIR}/libm/include 75 74 ) 76 75 77 76 include_directories(AFTER ··· 79 78 ${CMAKE_CURRENT_SOURCE_DIR}/external/IOKitUser/include 80 79 ${CMAKE_CURRENT_SOURCE_DIR}/launchd/liblaunch/include 81 80 ${CMAKE_CURRENT_SOURCE_DIR}/sandbox/include 81 81 + ${CMAKE_CURRENT_SOURCE_DIR}/CoreServices/include 82 82 + ${CMAKE_CURRENT_SOURCE_DIR}/external/coretls/include 82 83 ${CMAKE_SOURCE_DIR}/src/libmalloc/include 83 84 ${CMAKE_SOURCE_DIR}/src/libinfo/include 84 85 ${CMAKE_SOURCE_DIR}/src/external/syslog/libsystem_asl.tproj/include ··· 86 87 ${CMAKE_SOURCE_DIR}/kernel-include/iokit 87 88 ${CMAKE_SOURCE_DIR}/src/external/IOKitUser 88 89 ${CMAKE_CURRENT_SOURCE_DIR}/external/openpam/include 90 90 + ${CMAKE_CURRENT_SOURCE_DIR}/external/sqlite/include 89 91 ${CMAKE_CURRENT_SOURCE_DIR}/DebugSymbols/include 92 92 + ${CMAKE_CURRENT_SOURCE_DIR}/OpenScripting/include 90 93 ${CMAKE_SOURCE_DIR}/src/CryptoTokenKit/include 91 94 ${CMAKE_SOURCE_DIR}/src/LocalAuthentication/include 92 95 ${CMAKE_CURRENT_SOURCE_DIR}/AppleSystemInfo/include ··· 129 132 add_subdirectory(libresolv) 130 133 add_subdirectory(external/corecrypto) 131 134 add_subdirectory(external/coretls) 132 132 - add_subdirectory(libstdcxx) 133 135 add_subdirectory(libffi) 134 136 add_subdirectory(xtrace) 135 137 add_subdirectory(dyld) ··· 160 162 #add_subdirectory(VideoDecodeAcceleration) 161 163 add_subdirectory(DiskArbitration) 162 164 add_subdirectory(AppleSystemInfo) 163 163 - add_subdirectory(CryptoTokenKit) 164 165 add_subdirectory(LocalAuthentication) 165 165 - add_subdirectory(external/SmartCardServices) 166 166 + add_subdirectory(CryptoTokenKit) 166 167 add_subdirectory(xar) 167 168 add_subdirectory(libedit) 168 169 add_subdirectory(external/libclosure) ··· 175 176 #add_subdirectory(external/libauto) 176 177 add_subdirectory(external/libarchive/libarchive) 177 178 add_subdirectory(external/apr) 178 178 - add_subdirectory(external/security) 179 179 add_subdirectory(sandbox) 180 180 add_subdirectory(xcselect) 181 181 #add_subdirectory(Cocoa) ··· 223 223 add_subdirectory(login) 224 224 add_subdirectory(DebugSymbols) 225 225 add_subdirectory(external/bsm) 226 226 - add_subdirectory(external/Heimdal) 226 226 + # Requires a newer version of Security to build 227 227 + #add_subdirectory(external/Heimdal) 228 228 + 229 229 + # Subprojects after this line need C++ headers 230 230 + 231 231 + include_directories(BEFORE 232 232 + ${CMAKE_CURRENT_SOURCE_DIR}/external/libcxxabi/include 233 233 + ) 234 234 + 235 235 + # libstdc++ doesn't use the headers included below 236 236 + add_subdirectory(libstdcxx) 237 237 + 238 238 + include_directories(BEFORE 239 239 + ${CMAKE_CURRENT_SOURCE_DIR}/external/libcxx/include 240 240 + ) 227 241 228 242 add_subdirectory(external/libcxxabi) 229 243 add_subdirectory(external/libcxx) 230 230 - add_subdirectory(lkm) 231 231 - 244 244 + # Requires a newer Security version 245 245 + #add_subdirectory(external/SmartCardServices) 246 246 + add_subdirectory(external/security) 232 247 248 248 + add_subdirectory(lkm)

+15 -14

src/libstdcxx/CMakeLists.txt

reviewed

··· 1 1 project(darling-libstdcxx) 2 2 3 3 - cmake_minimum_required(VERSION 2.4.0) 4 4 - enable_language(C ASM) 3 3 + add_compile_options( 4 4 + -nostdinc 5 5 + -nostdinc++ 6 6 + -w 7 7 + -include${CMAKE_CURRENT_SOURCE_DIR}/build.h 8 8 + ) 5 9 6 6 - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse -msse2 -msse3 -w -nostdinc -nostdinc++") 7 7 - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D__DARWIN_UNIX03 -fPIC -w -include ${CMAKE_CURRENT_SOURCE_DIR}/build.h") 8 8 - set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -nostdlib") 10 10 + include_directories(BEFORE 11 11 + ${CMAKE_CURRENT_SOURCE_DIR}/include/c++/4.2.1 12 12 + ${CMAKE_CURRENT_SOURCE_DIR}/include/c++/4.2.1/backward 13 13 + ) 9 14 10 10 - include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/include/c++/4.2.1) 11 11 - include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/include/c++/4.2.1/backward) 12 15 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../kernel-include) 13 13 - include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../libc/locale) 14 14 - include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../libc/locale/FreeBSD) 15 15 - include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../libc/stdtime/FreeBSD) 16 16 - include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../libc/pthreads) 17 17 - include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../external/libcxxabi/include) 18 16 19 19 - add_definitions(-D__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__=1080) 20 20 - add_definitions(-DBUILDING_LIBSTDCXX -D_LIBCPPABI_VERSION=1) 17 17 + add_definitions( 18 18 + -D__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__=1080 19 19 + -DBUILDING_LIBSTDCXX 20 20 + -D_LIBCPPABI_VERSION=1 21 21 + ) 21 22 22 23 set(libstdcxx_sources 23 24 src/allocator-inst.cc