diff --git a/plugins/colorengines/lcms2/CMakeLists.txt b/plugins/colorengines/lcms2/CMakeLists.txt
index fa4107490e..8569298f52 100644
--- a/plugins/colorengines/lcms2/CMakeLists.txt
+++ b/plugins/colorengines/lcms2/CMakeLists.txt
@@ -1,98 +1,98 @@
 project( lcmsengine )
 
-if(!WIN32)
+if(NOT WIN32)
 ## Only test if on non-Windows system
 	add_subdirectory(tests)
 endif()
 
 include_directories( ${PIGMENT_INCLUDES} ${LCMS2_INCLUDE_DIR} )
 
 include_directories( 
     ${CMAKE_CURRENT_SOURCE_DIR}/colorspaces/cmyk_u8
     ${CMAKE_CURRENT_SOURCE_DIR}/colorspaces/cmyk_u16
     ${CMAKE_CURRENT_SOURCE_DIR}/colorspaces/cmyk_f32
     ${CMAKE_CURRENT_SOURCE_DIR}/colorspaces/gray_u8
     ${CMAKE_CURRENT_SOURCE_DIR}/colorspaces/gray_u16
     ${CMAKE_CURRENT_SOURCE_DIR}/colorspaces/gray_f32
     ${CMAKE_CURRENT_SOURCE_DIR}/colorspaces/lab_u8
     ${CMAKE_CURRENT_SOURCE_DIR}/colorspaces/lab_u16
     ${CMAKE_CURRENT_SOURCE_DIR}/colorspaces/lab_f32
     ${CMAKE_CURRENT_SOURCE_DIR}/colorspaces/rgb_u8
     ${CMAKE_CURRENT_SOURCE_DIR}/colorspaces/rgb_u16
     ${CMAKE_CURRENT_SOURCE_DIR}/colorspaces/rgb_f32
     ${CMAKE_CURRENT_SOURCE_DIR}/colorspaces/xyz_u8
     ${CMAKE_CURRENT_SOURCE_DIR}/colorspaces/xyz_u16
     ${CMAKE_CURRENT_SOURCE_DIR}/colorspaces/xyz_f32
     ${CMAKE_CURRENT_SOURCE_DIR}/colorspaces/ycbcr_u8
     ${CMAKE_CURRENT_SOURCE_DIR}/colorspaces/ycbcr_u16
     ${CMAKE_CURRENT_SOURCE_DIR}/colorspaces/ycbcr_f32
     ${CMAKE_CURRENT_SOURCE_DIR}/colorprofiles
 )
 
 if (HAVE_LCMS24 AND OPENEXR_FOUND)
 include_directories( 
     ${CMAKE_CURRENT_SOURCE_DIR}/colorspaces/rgb_f16
     ${CMAKE_CURRENT_SOURCE_DIR}/colorspaces/xyz_f16
 )
 endif ()
 
 set(FILE_OPENEXR_SOURCES)
 set(LINK_OPENEXR_LIB)
 if(OPENEXR_FOUND)
     include_directories(${OPENEXR_INCLUDE_DIR})
     set(LINK_OPENEXR_LIB ${OPENEXR_LIBRARIES})
     add_definitions(${OPENEXR_DEFINITIONS})
 endif()
 
 
 set ( lcmsengine_SRCS
     colorspaces/cmyk_u8/CmykU8ColorSpace.cpp
     colorspaces/cmyk_u16/CmykU16ColorSpace.cpp
     colorspaces/cmyk_f32/CmykF32ColorSpace.cpp
 
     colorspaces/gray_u8/GrayU8ColorSpace.cpp
     colorspaces/gray_u16/GrayU16ColorSpace.cpp
     colorspaces/gray_f32/GrayF32ColorSpace.cpp
 
     colorspaces/lab_u8/LabU8ColorSpace.cpp
     colorspaces/lab_u16/LabColorSpace.cpp
     colorspaces/lab_f32/LabF32ColorSpace.cpp
 
     colorspaces/xyz_u8/XyzU8ColorSpace.cpp
     colorspaces/xyz_u16/XyzU16ColorSpace.cpp
     colorspaces/xyz_f32/XyzF32ColorSpace.cpp
 
     colorspaces/rgb_u8/RgbU8ColorSpace.cpp
     colorspaces/rgb_u16/RgbU16ColorSpace.cpp
     colorspaces/rgb_f32/RgbF32ColorSpace.cpp
 
     colorspaces/ycbcr_u8/YCbCrU8ColorSpace.cpp
     colorspaces/ycbcr_u16/YCbCrU16ColorSpace.cpp
     colorspaces/ycbcr_f32/YCbCrF32ColorSpace.cpp
 
     colorprofiles/LcmsColorProfileContainer.cpp
     colorprofiles/IccColorProfile.cpp
     IccColorSpaceEngine.cpp
     LcmsColorSpace.cpp
     LcmsEnginePlugin.cpp
 )
 
 if (HAVE_LCMS24 AND OPENEXR_FOUND)
     set ( lcmsengine_SRCS
         ${lcmsengine_SRCS}
         colorspaces/rgb_f16/RgbF16ColorSpace.cpp
         colorspaces/xyz_f16/XyzF16ColorSpace.cpp
     )
 endif ()
 
 
 
 kde4_add_plugin(kolcmsengine ${lcmsengine_SRCS})
 
 target_link_libraries(kolcmsengine pigmentcms ${LCMS2_LIBRARIES}  ${LINK_OPENEXR_LIB})
 install(TARGETS kolcmsengine DESTINATION ${PLUGIN_INSTALL_DIR})
 
 ########### install files ###############
 
 install( FILES kolcmsengine.desktop DESTINATION ${SERVICES_INSTALL_DIR}/calligra)
 
diff --git a/plugins/colorengines/lcms2/tests/CMakeLists.txt b/plugins/colorengines/lcms2/tests/CMakeLists.txt
index a7a9d9e7e4..ebd9faf57e 100644
--- a/plugins/colorengines/lcms2/tests/CMakeLists.txt
+++ b/plugins/colorengines/lcms2/tests/CMakeLists.txt
@@ -1,52 +1,53 @@
 add_definitions(-DFILES_DATA_DIR="${CMAKE_CURRENT_SOURCE_DIR}/data/")
 
 set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
 include_directories( ../colorspaces/cmyk_u16
     ../colorspaces/cmyk_u8
     ../colorspaces/gray_u16
     ../colorspaces/gray_u16_no_alpha
     ../colorspaces/gray_u8
     ../colorspaces/gray_u8_no_alpha
     ../colorspaces/lab_u16
     ../colorspaces/rgb_u16
     ../colorspaces/rgb_u8
     ../colorspaces/xyz_u16
     ../colorprofiles
     ..
 )
 if(OPENEXR_FOUND)
     include_directories(${OPENEXR_INCLUDE_DIR})
 endif()
 include_directories( ${PIGMENT_INCLUDES} ${LCMS2_INCLUDE_DIR} )
 
 
 if(MSVC OR (WIN32 AND "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Intel"))
   # avoid "cannot open file 'LIBC.lib'" error
   set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /NODEFAULTLIB:LIBC.LIB")
 endif()
 
 ########### next target ###############
 
 set(TestKoLcmsColorProfile_test_SRCS TestKoLcmsColorProfile.cpp )
 
 kde4_add_unit_test(TestKoLcmsColorProfile TESTNAME libs-pigment-TestKoLcmsColorProfile  ${TestKoLcmsColorProfile_test_SRCS})
 
 target_link_libraries(TestKoLcmsColorProfile  ${KDE4_KDEUI_LIBS} pigmentcms ${QT_QTTEST_LIBRARY}  ${LCMS2_LIBRARIES} kolcmsengine )
 
 ########### next target ###############
 
 set(TestKoColorSpaceRegistry_test_SRCS TestKoColorSpaceRegistry.cpp )
 
 kde4_add_unit_test(TestKoColorSpaceRegistry TESTNAME libs-pigment-TestKoColorSpaceRegistry  ${TestKoColorSpaceRegistry_test_SRCS})
 
 target_link_libraries(TestKoColorSpaceRegistry  ${KDE4_KDEUI_LIBS} pigmentcms ${LCMS2_LIBRARIES} ${QT_QTTEST_LIBRARY})
 
 ########### next target ###############
 
-set(TestKoCompositeOps_test_SRCS TestKoCompositeOps.cpp )
+#set(TestKoCompositeOps_test_SRCS TestKoCompositeOps.cpp )
 
-kde4_add_unit_test(TestKoCompositeOps TESTNAME libs-pigment-TestKoCompositeOps ${TestKoCompositeOps_test_SRCS})
+#kde4_add_unit_test(TestKoCompositeOps TESTNAME libs-pigment-TestKoCompositeOps ${TestKoCompositeOps_test_SRCS})
+
+#target_link_libraries(TestKoCompositeOps  ${KDE4_KDEUI_LIBS} pigmentcms ${QT_QTTEST_LIBRARY})
 
-target_link_libraries(TestKoCompositeOps  ${KDE4_KDEUI_LIBS} pigmentcms ${QT_QTTEST_LIBRARY})