projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Initial build fixes for Windows/MinGW.
[pulseview.git]
/
CMakeLists.txt
diff --git
a/CMakeLists.txt
b/CMakeLists.txt
index 78c1f8e462f336cf1f0611fc4d6fe3237a553e50..0ed74e444af5e5284b767753f75bb897ebfde534 100644
(file)
--- a/
CMakeLists.txt
+++ b/
CMakeLists.txt
@@
-67,16
+67,33
@@
include(${QT_USE_FILE})
add_definitions(${QT_DEFINITIONS})
add_definitions(-DAPP_VERSION="${VERSION}")
add_definitions(${QT_DEFINITIONS})
add_definitions(-DAPP_VERSION="${VERSION}")
+# On Windows/MinGW we need PKGDEPS_STATIC_INCLUDE_DIRS.
+if(WIN32)
+include_directories(
+ ${include_directories}
+ ${Boost_INCLUDE_DIRS}
+ ${PKGDEPS_STATIC_INCLUDE_DIRS}
+)
+else(WIN32)
include_directories(
${include_directories}
${Boost_INCLUDE_DIRS}
${PKGDEPS_INCLUDE_DIRS}
)
include_directories(
${include_directories}
${Boost_INCLUDE_DIRS}
${PKGDEPS_INCLUDE_DIRS}
)
+endif(WIN32)
+# On Windows/MinGW we need PKGDEPS_STATIC_LIBRARY_DIRS.
+if(WIN32)
+link_directories(
+ ${Boost_LIBRARY_DIRS}
+ ${PKGDEPS_STATIC_LIBRARY_DIRS}
+)
+else(WIN32)
link_directories(
${Boost_LIBRARY_DIRS}
${PKGDEPS_LIBRARY_DIRS}
)
link_directories(
${Boost_LIBRARY_DIRS}
${PKGDEPS_LIBRARY_DIRS}
)
+endif(WIN32)
add_executable(pulseview
${pulseview_SOURCES}
add_executable(pulseview
${pulseview_SOURCES}
@@
-85,11
+102,20
@@
add_executable(pulseview
${pulseview_RESOURCES_RCC}
)
${pulseview_RESOURCES_RCC}
)
+# On Windows/MinGW we need PKGDEPS_STATIC_LIBRARIES.
+if(WIN32)
+target_link_libraries(pulseview
+ ${Boost_LIBRARIES}
+ ${PKGDEPS_STATIC_LIBRARIES}
+ ${QT_LIBRARIES}
+)
+else(WIN32)
target_link_libraries(pulseview
${Boost_LIBRARIES}
${PKGDEPS_LIBRARIES}
${QT_LIBRARIES}
)
target_link_libraries(pulseview
${Boost_LIBRARIES}
${PKGDEPS_LIBRARIES}
${QT_LIBRARIES}
)
+endif(WIN32)
add_definitions(-DBOOST_TEST_DYN_LINK)
add_definitions(-DBOOST_TEST_DYN_LINK)
@@
-97,11
+123,20
@@
add_executable(pulseview-test
${pulseview_TEST_SOURCES}
)
${pulseview_TEST_SOURCES}
)
+# On Windows/MinGW we need PKGDEPS_STATIC_LIBRARIES.
+if(WIN32)
+target_link_libraries(pulseview-test
+ ${Boost_LIBRARIES}
+ ${PKGDEPS_STATIC_LIBRARIES}
+ ${QT_LIBRARIES}
+)
+else(WIN32)
target_link_libraries(pulseview-test
${Boost_LIBRARIES}
${PKGDEPS_LIBRARIES}
${QT_LIBRARIES}
)
target_link_libraries(pulseview-test
${Boost_LIBRARIES}
${PKGDEPS_LIBRARIES}
${QT_LIBRARIES}
)
+endif(WIN32)
enable_testing()
add_test(test ${CMAKE_CURRENT_BINARY_DIR}/pulseview-test)
enable_testing()
add_test(test ${CMAKE_CURRENT_BINARY_DIR}/pulseview-test)