Revision: 76487
http://sourceforge.net/p/brlcad/code/76487
Author: starseeker
Date: 2020-07-25 10:12:09 +0000 (Sat, 25 Jul 2020)
Log Message:
-----------
Try building this with Qt5
Modified Paths:
--------------
brlcad/trunk/misc/repoconv/svn2git/svn-fast-export/CMakeLists.txt
Modified: brlcad/trunk/misc/repoconv/svn2git/svn-fast-export/CMakeLists.txt
===================================================================
--- brlcad/trunk/misc/repoconv/svn2git/svn-fast-export/CMakeLists.txt
2020-07-25 06:58:48 UTC (rev 76486)
+++ brlcad/trunk/misc/repoconv/svn2git/svn-fast-export/CMakeLists.txt
2020-07-25 10:12:09 UTC (rev 76487)
@@ -7,16 +7,17 @@
set(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH};${SVN2GIT_SOURCE_DIR}/CMake")
find_package(SubversionLibrary)
find_package(APR)
-find_package(Qt4 REQUIRED QtCore)
-include(${QT_USE_FILE})
+find_package(Qt5 REQUIRED Core)
include_directories(
${CMAKE_CURRENT_SOURCE_DIR}
+ ${Qt5Core_INCLUDE_DIRS}
${SUBVERSION_INCLUDE_DIRS}
${APR_INCLUDE_DIRS}
)
+add_definitions(-fPIC)
+
include(CheckFunctionExists)
-cmake_push_check_state(RESET)
set(CMAKE_REQUIRED_INCLUDES ${SUBVERSION_INCLUDE_DIRS})
set(CMAKE_REQUIRED_LIBRARIES ${SUBVERSION_LIBRARIES})
check_function_exists(svn_repos_open3 HAVE_SVN_REPOS_OPEN3)
@@ -43,7 +44,6 @@
add_definitions(-Wno-deprecated-declarations)
endif(HAVE_SVN_STREAM_COPY)
endif(NOT HAVE_SVN_STREAM_COPY3)
-cmake_pop_check_state()
set(SVN2GIT_SRCS
ruleparser.cpp
@@ -56,7 +56,7 @@
add_definitions(-DVER="brlcad-svn2git-20140907")
add_executable(svn-all-fast-export ${SVN2GIT_SRCS})
-target_link_libraries(svn-all-fast-export ${SUBVERSION_LIBRARIES}
${QT_LIBRARIES})
+target_link_libraries(svn-all-fast-export ${SUBVERSION_LIBRARIES}
${Qt5Core_LIBRARIES})
# Local Variables:
# tab-width: 8
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
