[SCM] OCE packaging branch, debian, updated. debian/0.11-1

QbProg tholag at gmail.com
Thu Dec 13 19:16:50 UTC 2012


The following commit has been merged in the debian branch:
commit 7fd2ac9f4fcd7f70c8e584d200ec61022ceec945
Author: QbProg <tholag at gmail.com>
Date:   Wed Nov 28 21:00:02 2012 +0100

    Copy and build the precompiled header in the binary directory

diff --git a/adm/cmake/BuildToolkit.cmake b/adm/cmake/BuildToolkit.cmake
index 07b1cb1..77f5c00 100644
--- a/adm/cmake/BuildToolkit.cmake
+++ b/adm/cmake/BuildToolkit.cmake
@@ -7,9 +7,15 @@ FUNCTION(ENABLE_PRECOMPILED_HEADERS PHASE TARGET_NAME PRECOMPILED_HEADER SOURCE_
 
 		# Generate precompiled header translation unit
 		get_filename_component(pch_basename ${PRECOMPILED_HEADER} NAME_WE)
-		set(pch_abs ${CMAKE_CURRENT_SOURCE_DIR}/${PRECOMPILED_HEADER})
 		set(pch_unity ${CMAKE_CURRENT_SOURCE_DIR}/Precompiled.cpp)
 		
+		IF(MSVC)
+		    SET(pch_abs ${CMAKE_CURRENT_SOURCE_DIR}/${PRECOMPILED_HEADER})
+		ELSE()
+		    CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/Precompiled.h ${CMAKE_CURRENT_BINARY_DIR}/Precompiled.h)
+		    SET(pch_abs ${CMAKE_CURRENT_BINARY_DIR}/${PRECOMPILED_HEADER})
+		ENDIF()
+		
 		IF (PHASE EQUAL 2)
 			# A list of exclusions patterns. For the moment is global to the entire project
 			SET (excludes "OSD*" "WNT*" "AlienImage_BMPAlienData.cxx"

-- 
OCE packaging



More information about the debian-science-commits mailing list