X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=build%2Ftizen%2Fdali-scene-loader%2FCMakeLists.txt;h=f900b5a66aab1b1f0fbcf91ed25467a54b62528f;hp=7789dda93d7aa6152f702408f208b0e86c694271;hb=dbc1933c465f3612e4576c11f96ae2c660593a7e;hpb=dacbd89dae18b6e32bf97f3d26d379eee2c9013b

diff --git a/build/tizen/dali-scene-loader/CMakeLists.txt b/build/tizen/dali-scene-loader/CMakeLists.txt
index 7789dda..f900b5a 100644
--- a/build/tizen/dali-scene-loader/CMakeLists.txt
+++ b/build/tizen/dali-scene-loader/CMakeLists.txt
@@ -14,6 +14,8 @@ if(CMAKE_BUILD_TYPE MATCHES Debug)
 	add_definitions("-DDEBUG_ENABLED")
 endif()
 
+ADD_DEFINITIONS( "-DBUILDING_DALI_SCENE_LOADER" )
+
 foreach(flag ${PKGS_CFLAGS})
 	set(extra_flags "${extra_flags} ${flag}")
 endforeach(flag)
@@ -62,7 +64,7 @@ if (ENABLE_PKG_CONFIGURE)
 
 	set(PREFIX ${prefix})
 	set(EXEC_PREFIX ${CMAKE_INSTALL_PREFIX})
-	set(DEV_INCLUDE_PATH ${repo_root_dir})
+	set(DEV_INCLUDE_PATH ${INCLUDE_DIR})
 
 	set(core_pkg_cfg_file dali2-scene-loader.pc)
 	configure_file(${CMAKE_CURRENT_LIST_DIR}/${core_pkg_cfg_file}.in ${core_pkg_cfg_file} @ONLY)
@@ -86,10 +88,21 @@ SET_PROPERTY(DIRECTORY PROPERTY ADDITIONAL_MAKE_CLEAN_FILES
              "${GENERATED_SHADER_DIR}/generated/"
              "${GENERATED_SHADER_DIR}/builtin-shader-extern-gen.h")
 
+IF( WIN32)
+  # When Using VCPKG, the default is always set to Debug if CMAKE_BUILD_TYPE is not set
+  IF( NOT CMAKE_BUILD_TYPE )
+    SET(SHADER_GENERATOR_BINARY ${CMAKE_CURRENT_BINARY_DIR}/../Debug/${SHADER_GENERATOR_NAME})
+  ELSE()
+    SET(SHADER_GENERATOR_BINARY ${CMAKE_CURRENT_BINARY_DIR}/../${CMAKE_BUILD_TYPE}/${SHADER_GENERATOR_NAME})
+  ENDIF()
+ELSE()
+  SET(SHADER_GENERATOR_BINARY ${CMAKE_CURRENT_BINARY_DIR}/../${SHADER_GENERATOR_NAME})
+ENDIF()
+
 SET( BUILT_IN_SHADER_GEN_CPP "${GENERATED_SHADER_DIR}/generated/builtin-shader-gen.cpp")
 ADD_CUSTOM_COMMAND(OUTPUT ${BUILT_IN_SHADER_GEN_CPP}
-                   DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/../${SHADER_GENERATOR_NAME}
-                   COMMAND ${CMAKE_CURRENT_BINARY_DIR}/../${SHADER_GENERATOR_NAME} ${SHADER_SOURCE_DIR} ${SHADER_GENERATED_DIR})
+                   DEPENDS ${SHADER_GENERATOR_BINARY}
+                   COMMAND ${SHADER_GENERATOR_BINARY} ${SHADER_SOURCE_DIR} ${SHADER_GENERATED_DIR})
 
 SET( scene_loader_src_files ${scene_loader_src_files} ${BUILT_IN_SHADER_GEN_CPP} )