diff --git a/CMakeLists.txt b/CMakeLists.txt index 7e007eee5070d38c77ecd79479d74f08f889569a..a01847241793aaa41d243f210e97ce840e5e3683 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,7 @@ cmake_minimum_required(VERSION 2.8) MESSAGE("framework CMakeLists") IF(WIN32) +add_definitions(-D_WIN32_WINNT=0x601) #include(config/CMakeChaosWin.txt) macro (MESG parm) SET(WHERE ${CMAKE_CURRENT_LIST_DIR}) diff --git a/chaos/cu_toolkit/CMakeLists.txt b/chaos/cu_toolkit/CMakeLists.txt index 827496dcf5b6d91a4e73058a71e3ee8f9ab0bb27..c09092d63b93f880f5ef444b32ec7fc93054f842 100644 --- a/chaos/cu_toolkit/CMakeLists.txt +++ b/chaos/cu_toolkit/CMakeLists.txt @@ -1,8 +1,10 @@ project(chaos_cutoolkit) if(WIN32) + set(CMAKE_SUPPRESS_REGENERATION true) INCLUDE_DIRECTORIES( ../../ ${ALL_WINDOWS_INCLUDE_DIR}) INCLUDE_DIRECTORIES(${CMAKE_INSTALL_PREFIX}/boostinstall/include/boost-1_70) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}/boostinstall/include/boost-1_70) link_directories(${CMAKE_CURRENT_BINARY_DIR}/boostinstall/lib) ELSE() INCLUDE_DIRECTORIES(chaos/cu ../../) @@ -96,7 +98,7 @@ set (BOOST_LIBPATH ${CMAKE_INSTALL_PREFIX}/boostinstall/lib ) SET (ALL_WINDOWS_LIBS "DbgHelp.lib Netapi32.lib Iphlpapi.lib -LIBPATH:${BOOST_LIBPATH} chaos_common") separate_arguments(chaos_cutoolkit_lib) -TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${ALL_WINDOWS_LIBS}) +TARGET_LINK_LIBRARIES(${PROJECT_NAME} chaos_common ${ALL_WINDOWS_LIBS}) FILE(GLOB files "*.h") INSTALL(FILES ${files} DESTINATION include/chaos/cu_toolkit) diff --git a/chaos_metadata_service_client/CMakeLists.txt b/chaos_metadata_service_client/CMakeLists.txt index ce9d7611e55d8a40f7aac6b69a7ae6acb23f02a1..e7a5b34ecd8165618347d8d063b1eaaf652bc341 100644 --- a/chaos_metadata_service_client/CMakeLists.txt +++ b/chaos_metadata_service_client/CMakeLists.txt @@ -146,7 +146,7 @@ ENDIF () IF (WIN32) -TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${ALL_WINDOWS_LIBPATH} "-LIBPATH:C:/Users/aduffizi/source/repos/chaos_bundle/INSTALLPATH/lib/" chaos_common.lib ) +TARGET_LINK_LIBRARIES(${PROJECT_NAME} chaos_common ${ALL_WINDOWS_LIBPATH} ) ELSE() TARGET_LINK_LIBRARIES(${PROJECT_NAME} chaos_common ${FrameworkLib}) ENDIF() diff --git a/chaos_micro_unit_toolkit/CMakeLists.txt b/chaos_micro_unit_toolkit/CMakeLists.txt index b9e6a22aa237bae02f3d4ab596a4a3d992e42b16..89e6aaf3cd0431390420cfd27b433666b1963de4 100644 --- a/chaos_micro_unit_toolkit/CMakeLists.txt +++ b/chaos_micro_unit_toolkit/CMakeLists.txt @@ -58,7 +58,7 @@ ENDIF () if(WIN32) -TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${ALL_WINDOWS_LIBPATH} ) +TARGET_LINK_LIBRARIES(${PROJECT_NAME} chaos_common ${ALL_WINDOWS_LIBPATH} ) else() TARGET_LINK_LIBRARIES(${PROJECT_NAME} pthread) endif()