Changeset 267 in pacpusframework for trunk

Timestamp:

Mar 13, 2014, 10:41:15 AM (11 years ago)

Author:

Marek Kurdej

Message:

Minor: formatting.

Location:

trunk/cmake

Files:

• PacpusDependencies.cmake (modified) (3 diffs)
• PacpusInstall.cmake (modified) (1 diff)
• PacpusUtilities.cmake (modified) (1 diff)
• igep_toolchain.cmake (modified) (1 diff)

trunk/cmake/PacpusDependencies.cmake

@@ -19 +19 @@
 get_filename_component(QT_CMAKE_DIR "${QT_CMAKE_DIR}" ABSOLUTE)
 if(DEBUG)
-        message(STATUS "\${QT_CMAKE_DIR} = '${QT_CMAKE_DIR}'")
+    message(STATUS "\${QT_CMAKE_DIR} = '${QT_CMAKE_DIR}'")
 endif()
 list(APPEND CMAKE_PREFIX_PATH
@@ -25 +25 @@
 )
 if(WIN32)
-        set(WINSDK_LIB "$ENV{WINSDK_LIB}" CACHE PATH "Directory of Windows Development Kit, should contain glu32.lib.")
-        if("${WINSDK_LIB}" STREQUAL "")
-                message(STATUS "Environment variable 'WINSDK_LIB' should be set to something like 'C:/Program Files (x86)/Windows Kits/8.0/Lib/win8/um/x86'")
-        endif()
-        if(DEBUG)
-                message(STATUS "\$ENV{WINSDK_LIB} = '$ENV{WINSDK_LIB}'")
-                message(STATUS "\${WINSDK_LIB} = '${WINSDK_LIB}'")
-        endif()
+    set(WINSDK_LIB "$ENV{WINSDK_LIB}" CACHE PATH "Directory of Windows Development Kit, should contain glu32.lib.")
+    if("${WINSDK_LIB}" STREQUAL "")
+        message(STATUS "Environment variable 'WINSDK_LIB' should be set to something like 'C:/Program Files (x86)/Windows Kits/8.0/Lib/win8/um/x86'")
+    endif()
+    if(DEBUG)
+        message(STATUS "\$ENV{WINSDK_LIB} = '$ENV{WINSDK_LIB}'")
+        message(STATUS "\${WINSDK_LIB} = '${WINSDK_LIB}'")
+    endif()
     list(APPEND CMAKE_PREFIX_PATH
         ${WINSDK_LIB}
@@ -38 +38 @@
 endif()
 if(DEBUG)
-        message(STATUS "\${CMAKE_PREFIX_PATH} = '${CMAKE_PREFIX_PATH}'")
+    message(STATUS "\${CMAKE_PREFIX_PATH} = '${CMAKE_PREFIX_PATH}'")
 endif()
 

trunk/cmake/PacpusInstall.cmake

@@ -13 +13 @@
     DIRECTORY ${PACPUS_CMAKE_DIR}
     DESTINATION ${PACPUS_INSTALL_DIR}
-        PATTERN "in" EXCLUDE
+    PATTERN "in" EXCLUDE
 )
 configure_file("${PACPUS_CMAKE_DIR}/in/${PROJECT_NAME}Config.cmake.in" "${CMAKE_BINARY_DIR}/${PROJECT_NAME}Config.cmake" @ONLY)

trunk/cmake/PacpusUtilities.cmake

@@ -309 +309 @@
         PROPERTIES DEBUG_POSTFIX "_d"
     )
-        # Add manifest to the target (Windows SxS)
-        # TODO: do the same for executable (change #2 to #1)
-        #if(MSVC)
-        #       pacpus_info("\${CMAKE_CURRENT_SOURCE_DIR}/\${target}.manifest = ${CMAKE_CURRENT_SOURCE_DIR}/${target}.manifest")
-        #       if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}\\${target}.manifest")
-        #               pacpus_info("Exists: ${CMAKE_CURRENT_SOURCE_DIR}/${target}.manifest")
-        #               add_custom_command(
-        #                       TARGET ${target}
-        #                       POST_BUILD
-        #                       COMMAND "mt.exe" -manifest \"${CMAKE_CURRENT_SOURCE_DIR}\\${target}.manifest\" -outputresource:\"$(TargetDir)\\$(TargetFileName)\"\;\#2
-        #                       COMMENT "Adding custom manifest containing MSVCRT80 dependency..." 
-        #               )
-        #       endif()
-        #endif()
+    # Add manifest to the target (Windows SxS)
+    # TODO: do the same for executable (change #2 to #1)
+    #if(MSVC)
+    #    pacpus_info("\${CMAKE_CURRENT_SOURCE_DIR}/\${target}.manifest = ${CMAKE_CURRENT_SOURCE_DIR}/${target}.manifest")
+    #    if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}\\${target}.manifest")
+    #        pacpus_info("Exists: ${CMAKE_CURRENT_SOURCE_DIR}/${target}.manifest")
+    #        add_custom_command(
+    #            TARGET ${target}
+    #            POST_BUILD
+    #            COMMAND "mt.exe" -manifest \"${CMAKE_CURRENT_SOURCE_DIR}\\${target}.manifest\" -outputresource:\"$(TargetDir)\\$(TargetFileName)\"\;\#2
+    #            COMMENT "Adding custom manifest containing MSVCRT80 dependency..." 
+    #        )
+    #    endif()
+    #endif()
 endfunction()
 

trunk/cmake/igep_toolchain.cmake

@@ -7 +7 @@
 
 if(EXISTS "/opt/poky/1.3/sysroots/x86_64-pokysdk-linux")#64 bits
-        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)
-        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++)
+    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)
+    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++)
         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)
         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)
         SET(QT_QMAKE_EXECUTABLE /opt/poky/1.3/sysroots/x86_64-pokysdk-linux/usr/bin/qmake2)
 elseif(EXISTS "/opt/poky/1.3/sysroots/i686-pokysdk-linux")#32 bits
-        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)
-        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++)
+    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)
+    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++)
         SET(CMAKE_LINKER       /opt/poky/1.3/sysroots/i686-pokysdk-linux/usr/bin/armv7a-vfp-neon-poky-linux-gnueabi/arm-poky-linux-gnueabi-ld)
         SET(CMAKE_AR           /opt/poky/1.3/sysroots/i686-pokysdk-linux/usr/bin/armv7a-vfp-neon-poky-linux-gnueabi/arm-poky-linux-gnueabi-ar)