Changeset 267 in pacpusframework for trunk/cmake
- Timestamp:
- Mar 13, 2014, 10:41:15 AM (11 years ago)
- Location:
- trunk/cmake
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/cmake/PacpusDependencies.cmake
r241 r267 19 19 get_filename_component(QT_CMAKE_DIR "${QT_CMAKE_DIR}" ABSOLUTE) 20 20 if(DEBUG) 21 21 message(STATUS "\${QT_CMAKE_DIR} = '${QT_CMAKE_DIR}'") 22 22 endif() 23 23 list(APPEND CMAKE_PREFIX_PATH … … 25 25 ) 26 26 if(WIN32) 27 28 29 30 31 32 33 34 27 set(WINSDK_LIB "$ENV{WINSDK_LIB}" CACHE PATH "Directory of Windows Development Kit, should contain glu32.lib.") 28 if("${WINSDK_LIB}" STREQUAL "") 29 message(STATUS "Environment variable 'WINSDK_LIB' should be set to something like 'C:/Program Files (x86)/Windows Kits/8.0/Lib/win8/um/x86'") 30 endif() 31 if(DEBUG) 32 message(STATUS "\$ENV{WINSDK_LIB} = '$ENV{WINSDK_LIB}'") 33 message(STATUS "\${WINSDK_LIB} = '${WINSDK_LIB}'") 34 endif() 35 35 list(APPEND CMAKE_PREFIX_PATH 36 36 ${WINSDK_LIB} … … 38 38 endif() 39 39 if(DEBUG) 40 40 message(STATUS "\${CMAKE_PREFIX_PATH} = '${CMAKE_PREFIX_PATH}'") 41 41 endif() 42 42 -
trunk/cmake/PacpusInstall.cmake
r251 r267 13 13 DIRECTORY ${PACPUS_CMAKE_DIR} 14 14 DESTINATION ${PACPUS_INSTALL_DIR} 15 15 PATTERN "in" EXCLUDE 16 16 ) 17 17 configure_file("${PACPUS_CMAKE_DIR}/in/${PROJECT_NAME}Config.cmake.in" "${CMAKE_BINARY_DIR}/${PROJECT_NAME}Config.cmake" @ONLY) -
trunk/cmake/PacpusUtilities.cmake
r265 r267 309 309 PROPERTIES DEBUG_POSTFIX "_d" 310 310 ) 311 312 313 314 #pacpus_info("\${CMAKE_CURRENT_SOURCE_DIR}/\${target}.manifest = ${CMAKE_CURRENT_SOURCE_DIR}/${target}.manifest")315 #if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}\\${target}.manifest")316 #pacpus_info("Exists: ${CMAKE_CURRENT_SOURCE_DIR}/${target}.manifest")317 #add_custom_command(318 #TARGET ${target}319 #POST_BUILD320 #COMMAND "mt.exe" -manifest \"${CMAKE_CURRENT_SOURCE_DIR}\\${target}.manifest\" -outputresource:\"$(TargetDir)\\$(TargetFileName)\"\;\#2321 #COMMENT "Adding custom manifest containing MSVCRT80 dependency..."322 #)323 #endif()324 311 # Add manifest to the target (Windows SxS) 312 # TODO: do the same for executable (change #2 to #1) 313 #if(MSVC) 314 # pacpus_info("\${CMAKE_CURRENT_SOURCE_DIR}/\${target}.manifest = ${CMAKE_CURRENT_SOURCE_DIR}/${target}.manifest") 315 # if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}\\${target}.manifest") 316 # pacpus_info("Exists: ${CMAKE_CURRENT_SOURCE_DIR}/${target}.manifest") 317 # add_custom_command( 318 # TARGET ${target} 319 # POST_BUILD 320 # COMMAND "mt.exe" -manifest \"${CMAKE_CURRENT_SOURCE_DIR}\\${target}.manifest\" -outputresource:\"$(TargetDir)\\$(TargetFileName)\"\;\#2 321 # COMMENT "Adding custom manifest containing MSVCRT80 dependency..." 322 # ) 323 # endif() 324 #endif() 325 325 endfunction() 326 326 -
trunk/cmake/igep_toolchain.cmake
r162 r267 7 7 8 8 if(EXISTS "/opt/poky/1.3/sysroots/x86_64-pokysdk-linux")#64 bits 9 10 9 SET(CMAKE_C_COMPILER /opt/poky/1.3/sysroots/x86_64-pokysdk-linux/usr/bin/armv7a-vfp-neon-poky-linux-gnueabi/arm-poky-linux-gnueabi-gcc) 10 SET(CMAKE_CXX_COMPILER /opt/poky/1.3/sysroots/x86_64-pokysdk-linux/usr/bin/armv7a-vfp-neon-poky-linux-gnueabi/arm-poky-linux-gnueabi-g++) 11 11 SET(CMAKE_LINKER /opt/poky/1.3/sysroots/x86_64-pokysdk-linux/usr/bin/armv7a-vfp-neon-poky-linux-gnueabi/arm-poky-linux-gnueabi-ld) 12 12 SET(CMAKE_AR /opt/poky/1.3/sysroots/x86_64-pokysdk-linux/usr/bin/armv7a-vfp-neon-poky-linux-gnueabi/arm-poky-linux-gnueabi-ar) 13 13 SET(QT_QMAKE_EXECUTABLE /opt/poky/1.3/sysroots/x86_64-pokysdk-linux/usr/bin/qmake2) 14 14 elseif(EXISTS "/opt/poky/1.3/sysroots/i686-pokysdk-linux")#32 bits 15 16 15 SET(CMAKE_C_COMPILER /opt/poky/1.3/sysroots/i686-pokysdk-linux/usr/bin/armv7a-vfp-neon-poky-linux-gnueabi/arm-poky-linux-gnueabi-gcc) 16 SET(CMAKE_CXX_COMPILER /opt/poky/1.3/sysroots/i686-pokysdk-linux/usr/bin/armv7a-vfp-neon-poky-linux-gnueabi/arm-poky-linux-gnueabi-g++) 17 17 SET(CMAKE_LINKER /opt/poky/1.3/sysroots/i686-pokysdk-linux/usr/bin/armv7a-vfp-neon-poky-linux-gnueabi/arm-poky-linux-gnueabi-ld) 18 18 SET(CMAKE_AR /opt/poky/1.3/sysroots/i686-pokysdk-linux/usr/bin/armv7a-vfp-neon-poky-linux-gnueabi/arm-poky-linux-gnueabi-ar)
Note:
See TracChangeset
for help on using the changeset viewer.