Skip to content

Commit 6a56cb0

Browse files
jef-njef-n
committedJan 24, 2017
updates and fixes for windows qt5/py3 build
·
ltr-3_40final-3_0_0
1 parent ea116fd commit 6a56cb0

File tree

94 files changed

+453
-636
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

94 files changed

+453
-636
lines changed
 

‎CMakeLists.txt

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -569,15 +569,16 @@ IF(COMMAND cmake_policy)
569569
IF(NOT "${CMAKE_VERSION}" VERSION_LESS "3.3")
570570
cmake_policy(SET CMP0063 NEW)
571571
ENDIF(NOT "${CMAKE_VERSION}" VERSION_LESS "3.3")
572+
IF(MSVC)
573+
cmake_policy(SET CMP0020 NEW)
574+
ENDIF(MSVC)
572575
ENDIF(COMMAND cmake_policy)
573576

574-
IF (WIN32)
575-
IF(PEDANTIC AND NOT APPLE)
576-
SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--no-undefined")
577-
SET(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,--no-undefined")
578-
SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--no-undefined")
579-
ENDIF(PEDANTIC AND NOT APPLE)
580-
ENDIF(WIN32)
577+
IF (PEDANTIC AND NOT WIN32 AND NOT APPLE)
578+
SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--no-undefined")
579+
SET(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,--no-undefined")
580+
SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--no-undefined")
581+
ENDIF(PEDANTIC AND NOT WIN32 AND NOT APPLE)
581582

582583
SET(CMAKE_CXX_VISIBILITY_PRESET hidden)
583584
INCLUDE(GenerateExportHeader)

‎cmake/FindProj.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ FIND_PATH(PROJ_INCLUDE_DIR proj_api.h
4141
"$ENV{LIB_DIR}/include"
4242
)
4343

44-
FIND_LIBRARY(PROJ_LIBRARY NAMES proj proj_i PATHS
44+
FIND_LIBRARY(PROJ_LIBRARY NAMES proj_i proj PATHS
4545
"$ENV{LIB}"
4646
"$ENV{LIB_DIR}/lib"
4747
)

3 commit comments

Comments
 (3)

NathanW2 commented on Jan 24, 2017

@NathanW2
NathanW2
on Jan 24, 2017
Member

@jef-n thanks heaps!

nirvn commented on Jan 24, 2017

@nirvn
nirvn
on Jan 24, 2017
Contributor

@jef-n , yay, exciting! Thanks for working on this.

tigerfoot commented on Jan 30, 2017

@tigerfoot
tigerfoot
on Jan 30, 2017

I'm looking a way to have the fixes for sip 4.19 backported to 2.18 and eventually 2.14 lts.
What would be the best approach for that ?

Please sign in to comment.