Changeset 7281
- Timestamp:
- 08/23/12 20:24:27 (12 years ago)
- Location:
- trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/CMakeLists.txt
r7279 r7281 62 62 elseif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") 63 63 set (OSCamOperatingSystem "Mac OS X") 64 SET( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m32" )65 SET( CMAKE_CFLAGS "${CMAKE_CFLAGS} -m32" )66 64 elseif (${CYGWIN}) 67 65 set (OSCamOperatingSystem "Windows/Cygwin") … … 166 164 # Manipulate config file based on given parameters and read unset parameters 167 165 168 # Available options 169 set(addons WEBIF HAVE_DVBAPI IRDETO_GUESSING CS_ANTICASC WITH_DEBUG WITH_SSL CS_CACHEEX LCDSUPPORT) 170 set(protocols MODULE_CAMD33 MODULE_CAMD35 MODULE_CAMD35_TCP MODULE_NEWCAMD MODULE_CCCAM MODULE_CCCSHARE MODULE_RADEGAST MODULE_SERIAL MODULE_MONITOR MODULE_CONSTCW) 171 set(readers WITH_CARDREADER READER_NAGRA READER_IRDETO READER_CONAX READER_CRYPTOWORKS READER_SECA READER_VIACCESS READER_VIDEOGUARD READER_DRE READER_TONGFANG READER_BULCRYPT) 166 execute_process (COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/config.sh --show-valid OUTPUT_VARIABLE config_vars_string OUTPUT_STRIP_TRAILING_WHITESPACE) 167 string(REGEX MATCHALL "[A-Z0-9_]+" config_vars ${config_vars_string}) 172 168 173 169 MACRO(GENERATE_OSCAM_CONFIG fullpath) 174 file(READ ${fullpath} config) 175 foreach(option ${addons} ${protocols} ${readers}) 170 foreach(option ${config_vars}) 176 171 if(DEFINED ${option}) 177 # Note: cmake does not read the file as individual lines but as a long178 # string, hence we use \n instead of ^ to determine where a line begins179 180 172 if(${option}) 181 string(REGEX REPLACE "\n//#define ${option}" "\n#define ${option}" config ${config})173 execute_process (COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/config.sh --enable ${option}) 182 174 else(${option}) 183 string(REGEX REPLACE "\n#define ${option}" "\n//#define ${option}" config ${config})175 execute_process (COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/config.sh --disable ${option}) 184 176 endif(${option}) 185 else(DEFINED ${option})186 # read value from current oscam-config.h187 188 if(${config} MATCHES "\n#define ${option}")189 SET(${option} TRUE)190 endif(${config} MATCHES "\n#define ${option}")191 177 endif(DEFINED ${option}) 192 178 endforeach(option) 193 file(WRITE ${fullpath} ${config})194 179 ENDMACRO(GENERATE_OSCAM_CONFIG fullpath) 195 180 … … 211 196 add_definitions ("-DWITH_LIBCRYPTO") 212 197 endif (HAVE_LIBCRYPTO) 198 199 execute_process (COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/config.sh --enabled WITH_SSL OUTPUT_VARIABLE CONFIG_WITH_SSL OUTPUT_STRIP_TRAILING_WHITESPACE) 200 if (CONFIG_WITH_SSL MATCHES "Y") 201 set (WITH_SSL TRUE) 202 endif (CONFIG_WITH_SSL MATCHES "Y") 213 203 214 204 find_package(OpenSSL QUIET) … … 520 510 # some optimisations 521 511 if (OSCamOperatingSystem MATCHES "Mac OS X") 522 add_definitions ("-m32 -mmacosx-version-min=10.5 -isysroot /Developer/SDKs/MacOSX10.5.sdk")512 add_definitions("-isysroot /Developer/SDKs/MacOSX10.6.sdk") 523 513 endif (OSCamOperatingSystem MATCHES "Mac OS X") 524 514 … … 529 519 if (OSCamOperatingSystem MATCHES "Mac OS X") 530 520 if (NOT CMAKE_BUILD_TYPE STREQUAL Debug) 531 set (CMAKE_EXE_LINKER_FLAGS "-s - m32 -mmacosx-version-min=10.5 -isysroot /Developer/SDKs/MacOSX10.5.sdk")521 set (CMAKE_EXE_LINKER_FLAGS "-s -isysroot /Developer/SDKs/MacOSX10.6.sdk") 532 522 else (NOT CMAKE_BUILD_TYPE STREQUAL Debug) 533 523 message (STATUS " building with debug") 534 set (CMAKE_EXE_LINKER_FLAGS "-ggdb - m32 -mmacosx-version-min=10.5 -isysroot /Developer/SDKs/MacOSX10.5.sdk")524 set (CMAKE_EXE_LINKER_FLAGS "-ggdb -isysroot /Developer/SDKs/MacOSX10.6.sdk") 535 525 endif (NOT CMAKE_BUILD_TYPE STREQUAL Debug) 536 526 else (OSCamOperatingSystem MATCHES "Mac OS X") -
trunk/utils/CMakeLists.txt
r7279 r7281 195 195 endif( HAVE_LIBRT OR HAVE_LIBRT_STATIC) 196 196 197 198 197 if( HAVE_LIBRT OR HAVE_LIBRT_STATIC) 199 198 #---- are we building ?
Note:
See TracChangeset
for help on using the changeset viewer.