Merge pull request #299 from LiamGFX/windows_changes

Visual Studio and Windows fixes
AcademySoftwareFoundation · Jun 21, 2018 · bdf2d84 · bdf2d84
2 parents f15b07d + 606c1c0
commit bdf2d84
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 4 deletions.
diff --git a/IlmBase/CMakeLists.txt b/IlmBase/CMakeLists.txt
@@ -139,7 +139,7 @@ ENDIF ()
 
 IF (FORCE_CXX03)
   FILE ( APPEND  ${CMAKE_CURRENT_BINARY_DIR}/config/IlmBaseConfig.h "#define ILMBASE_FORCE_CXX03 1\n" )
-ELIF (NOT WIN32)
+ELSEIF (NOT WIN32)
   # really only care about c++11 right now for the threading bits, but this can be changed to 14
   # when needed...
   # Note that the __cplusplus check is not valid under MSVC

diff --git a/PyIlmBase/PyImath/CMakeLists.txt b/PyIlmBase/PyImath/CMakeLists.txt
@@ -52,6 +52,11 @@ INSTALL ( TARGETS PyImath
 	lib
 )
 
+INSTALL (DIRECTORY ./
+    DESTINATION include
+    FILES_MATCHING PATTERN "*.h"
+)
+
 ADD_LIBRARY ( imathmodule ${LIB_TYPE}
     imathmodule.cpp
     PyImathFun.cpp

diff --git a/PyIlmBase/PyImathNumpy/CMakeLists.txt b/PyIlmBase/PyImathNumpy/CMakeLists.txt
@@ -3,9 +3,18 @@ ADD_LIBRARY ( imathnumpymodule ${LIB_TYPE}
     imathnumpymodule.cpp
 )
 
-SET_TARGET_PROPERTIES ( imathnumpymodule
-	PROPERTIES PREFIX "" SUFFIX ".so" BUILD_WITH_INSTALL_RPATH ON
-)
+IF (WIN32)
+    SET_TARGET_PROPERTIES (imathnumpymodule
+        PROPERTIES
+            PREFIX ""
+            OUTPUT_NAME "imathnumpy"
+            SUFFIX ".pyd"
+    )
+ELSE ()
+    SET_TARGET_PROPERTIES (imathnumpymodule
+        PROPERTIES PREFIX "" SUFFIX ".so" BUILD_WITH_INSTALL_RPATH ON
+    )
+ENDIF ()
 
 INCLUDE_DIRECTORIES (
 	${NUMPY_INCLUDE_DIRS}