]> The Tcpdump Group git mirrors - libpcap/commitdiff
Test "is this a 64-bit build?" rather than "is this not a 64-bit build?"
authorGuy Harris <[email protected]>
Sat, 16 Sep 2017 19:02:33 +0000 (12:02 -0700)
committerGuy Harris <[email protected]>
Sat, 16 Sep 2017 19:02:33 +0000 (12:02 -0700)
Yes, 32 < 64, so maybe you could make a case for putting the 32-bit case
first, but "not 64-bit" isn't a very intuitive way of saying "32-bit".

CMakeLists.txt

index 08b60043c8743aaf5f7ef9f6555f64b7f7647390..4cc9b0d4151788be2650f9b4191b1626225cc054 100644 (file)
@@ -821,19 +821,19 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cmakeconfig.h.in ${CMAKE_CURRENT_BINA
 # Install pcap library and include files
 ######################################
 if(WIN32)
-    if(NOT CMAKE_CL_64)
-        install(TARGETS ${LIBRARY_NAME} ${LIBRARY_NAME}_static
-                RUNTIME DESTINATION bin
-                LIBRARY DESTINATION lib
-                ARCHIVE DESTINATION lib)
-        install(FILES $<TARGET_PDB_FILE:${LIBRARY_NAME}> DESTINATION bin OPTIONAL)
-    else(NOT CMAKE_CL_64)
+    if(CMAKE_CL_64)
         install(TARGETS ${LIBRARY_NAME} ${LIBRARY_NAME}_static
                 RUNTIME DESTINATION bin/amd64
                 LIBRARY DESTINATION lib/amd64
                 ARCHIVE DESTINATION lib/amd64)
         install(FILES $<TARGET_PDB_FILE:${LIBRARY_NAME}> DESTINATION bin/amd64 OPTIONAL)
-    endif(NOT CMAKE_CL_64)
+    else(CMAKE_CL_64)
+        install(TARGETS ${LIBRARY_NAME} ${LIBRARY_NAME}_static
+                RUNTIME DESTINATION bin
+                LIBRARY DESTINATION lib
+                ARCHIVE DESTINATION lib)
+        install(FILES $<TARGET_PDB_FILE:${LIBRARY_NAME}> DESTINATION bin OPTIONAL)
+    endif(CMAKE_CL_64)
 else(WIN32)
     install(TARGETS ${LIBRARY_NAME} DESTINATION lib)
     install(TARGETS ${LIBRARY_NAME}_static DESTINATION lib)