Permalink
Browse files

fix broken CMakeLists.txt

  • Loading branch information...
1 parent f33a8c7 commit abf8a2373919fc4ef0c914e85cb4ea1948903c57 @wschweer wschweer committed Jun 7, 2012
Showing with 0 additions and 27 deletions.
  1. +0 −27 CMakeLists.txt
View
@@ -351,32 +351,6 @@ else (CMAKE_BUILD_TYPE STREQUAL "DEBUG")
endif (MINGW)
endif (CMAKE_BUILD_TYPE STREQUAL "DEBUG")
-<<<<<<< HEAD
-if (${CMAKE_CXX_COMPILER_ID} EQUAL "Clang")
- add_custom_command(
- OUTPUT ${PROJECT_BINARY_DIR}/all.h.pch
- COMMAND ${CMAKE_CXX_COMPILER}
- -x c++-header -g ${FLAGS}
- -I${QT_INCLUDE_DIR}
- -o all.h.pch all.h
- DEPENDS ${PROJECT_BINARY_DIR}/all.h
- WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
- )
- set (PCH ${PROJECT_BINARY_DIR}/all.h.pch)
-else (${CMAKE_CXX_COMPILER_ID} EQUAL "Clang")
- add_custom_command(
- OUTPUT ${PROJECT_BINARY_DIR}/all.h.gch
- COMMAND ${CMAKE_CXX_COMPILER}
- -x c++-header -g ${FLAGS}
- -I${QT_HEADERS_DIR}
- -o all.h.gch all.h
- DEPENDS ${PROJECT_BINARY_DIR}/all.h
- WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
- )
- set (PCH ${PROJECT_BINARY_DIR}/all.h.gch)
-endif(${CMAKE_CXX_COMPILER_ID} EQUAL "Clang")
-=======
-
add_custom_command(
OUTPUT ${PROJECT_BINARY_DIR}/all.h.gch
COMMAND ${CMAKE_CXX_COMPILER}
@@ -387,7 +361,6 @@ add_custom_command(
WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
)
set (PCH ${PROJECT_BINARY_DIR}/all.h.gch)
->>>>>>> ecabd2aa890bcbada78bfcb18e29019e9caa65a2
ADD_CUSTOM_TARGET(mops1 DEPENDS ${PROJECT_BINARY_DIR}/all.h)

0 comments on commit abf8a23

Please sign in to comment.