Skip to content

Commit

Permalink
else and endif constructs are empty
Browse files Browse the repository at this point in the history
  • Loading branch information
navzam committed Aug 12, 2013
1 parent 1cba97a commit c90093d
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions CMakeLists.txt
Expand Up @@ -33,7 +33,7 @@ if(WIN32)
link_directories(${CMAKE_SOURCE_DIR}/../prefix/lib) link_directories(${CMAKE_SOURCE_DIR}/../prefix/lib)
include_directories(${CMAKE_SOURCE_DIR}/../opencv/kiss-prefix/include) include_directories(${CMAKE_SOURCE_DIR}/../opencv/kiss-prefix/include)
link_directories(${CMAKE_SOURCE_DIR}/../opencv/kiss-prefix/lib) link_directories(${CMAKE_SOURCE_DIR}/../opencv/kiss-prefix/lib)
endif(WIN32) endif()


set(CMAKE_CXX_FLAGS "-Wall") set(CMAKE_CXX_FLAGS "-Wall")
add_definitions(-O3) add_definitions(-O3)
Expand All @@ -56,9 +56,9 @@ target_link_libraries(computer ${QT_LIBRARIES} pcompiler kovanserial kar kovan )


if(NOT WIN32) if(NOT WIN32)
target_link_libraries(computer opencv_core opencv_imgproc) target_link_libraries(computer opencv_core opencv_imgproc)
else(NOT WIN32) else()
target_link_libraries(computer opencv_core249 opencv_imgproc249) target_link_libraries(computer opencv_core249 opencv_imgproc249)
endif(NOT WIN32) endif()


macro(copy_files NAME FILES DESTINATION) macro(copy_files NAME FILES DESTINATION)
add_custom_target(copy_${NAME} ALL add_custom_target(copy_${NAME} ALL
Expand All @@ -78,10 +78,10 @@ endmacro(copy_files)
if(APPLE) if(APPLE)
copy_files(target ${RC}/target.c ${computer_SOURCE_DIR}/deploy/computer.app/Contents/prefix/usr/include) copy_files(target ${RC}/target.c ${computer_SOURCE_DIR}/deploy/computer.app/Contents/prefix/usr/include)
copy_files(platform.hints ${RC}/platform.hints ${computer_SOURCE_DIR}/deploy/computer.app/Contents) copy_files(platform.hints ${RC}/platform.hints ${computer_SOURCE_DIR}/deploy/computer.app/Contents)
else(APPLE) else()
copy_files(target ${RC}/target.c ${computer_SOURCE_DIR}/deploy/prefix/usr/include) copy_files(target ${RC}/target.c ${computer_SOURCE_DIR}/deploy/prefix/usr/include)
copy_files(platform.hints ${RC}/platform.hints ${computer_SOURCE_DIR}/deploy) copy_files(platform.hints ${RC}/platform.hints ${computer_SOURCE_DIR}/deploy)
endif(APPLE) endif()


if(APPLE) if(APPLE)
add_custom_target(computer_MacDeployQt ALL add_custom_target(computer_MacDeployQt ALL
Expand All @@ -98,4 +98,4 @@ if(APPLE)
COMMAND ${CMAKE_COMMAND} -E copy ${RC}/mac_icon.icns ${computer_SOURCE_DIR}/deploy/computer.app/Contents/Resources COMMAND ${CMAKE_COMMAND} -E copy ${RC}/mac_icon.icns ${computer_SOURCE_DIR}/deploy/computer.app/Contents/Resources
WORKING_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY} WORKING_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
DEPENDS computer Info.plist computer_MacDeployQt) DEPENDS computer Info.plist computer_MacDeployQt)
endif(APPLE) endif()

0 comments on commit c90093d

Please sign in to comment.