diff --git a/CMakeLists.txt b/CMakeLists.txt index 58f0885..f8c3a39 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -24,7 +24,7 @@ GET_FILENAME_COMPONENT(SIP_ROOT ${SIP_ROOT} DIRECTORY) IF(EXISTS "${PYTHON_ROOT}/PCbuild/python27.dll") INSTALL(FILES ${PYTHON_ROOT}/PCbuild/python27.dll DESTINATION bin) INSTALL(FILES ${PYTHON_ROOT}/PCbuild/python27.pdb DESTINATION pdb) -ELSEIF(EXISTS "${PYTHON_ROOT}/PCbuild/python27.dll") +ELSEIF(EXISTS "${PYTHON_ROOT}/PCbuild/amd64/python27.dll") INSTALL(FILES ${PYTHON_ROOT}/PCbuild/amd64/python27.dll DESTINATION bin) INSTALL(FILES ${PYTHON_ROOT}/PCbuild/amd64/python27.pdb DESTINATION pdb) ENDIF() diff --git a/src/runner/CMakeLists.txt b/src/runner/CMakeLists.txt index d3ed603..8585b00 100644 --- a/src/runner/CMakeLists.txt +++ b/src/runner/CMakeLists.txt @@ -16,10 +16,10 @@ SET(CMAKE_AUTOUIC ON) FIND_PACKAGE(Qt5Widgets REQUIRED) #QT5_WRAP_UI(${PROJ_NAME}_UIHDRS ${${PROJ_NAME}_FORMS}) -SET(Boost_USE_STATIC_LIBS ON) +SET(Boost_USE_STATIC_LIBS OFF) SET(Boost_USE_MULTITHREADED ON) -SET(Boost_USE_STATIC_RUNTIME OFF) -FIND_PACKAGE(Boost) +SET(Boost_USE_STATIC_RUNTIME OFF) +FIND_PACKAGE(Boost REQUIRED) IF (Boost_FOUND) INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS}) @@ -31,24 +31,22 @@ GET_FILENAME_COMPONENT(${default_project_path} ${default_project_path} REALPATH) SET(project_path "${default_project_path}" CACHE PATH "path to the other mo projects") SET(lib_path "${project_path}/../../install/libs") -MESSAGE(STATUS "${Boost_LIBRARY_DIRS}") - INCLUDE_DIRECTORIES(${project_path}/uibase/src ${PYTHON_ROOT}/Include ${SIP_ROOT} ${PYTHON_ROOT}/PC) - + LINK_DIRECTORIES(${lib_path} ${PYTHON_ROOT}/PCbuild ${Boost_LIBRARY_DIRS} ${SIP_ROOT}) - + ADD_LIBRARY(${PROJ_NAME} SHARED ${${PROJ_NAME}_HDRS} ${${PROJ_NAME}_SRCS}) TARGET_LINK_LIBRARIES(${PROJ_NAME} Qt5::Widgets uibase) -SET_TARGET_PROPERTIES(${PROJ_NAME} PROPERTIES COMPILE_FLAGS /GL) +SET_TARGET_PROPERTIES(${PROJ_NAME} PROPERTIES COMPILE_FLAGS "/GL") SET_TARGET_PROPERTIES(${PROJ_NAME} PROPERTIES LINK_FLAGS_RELWITHDEBINFO "/LTCG /LARGEADDRESSAWARE /OPT:REF /OPT:ICF") QT5_USE_MODULES(${PROJ_NAME} Widgets)